Kaydet (Commit) fdecbd4a authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Kill superfluous spacing before semicolons

Change-Id: I2c5c2c2e8c57796d147141748fb57a4c5645a96a
üst 5814e764
...@@ -42,8 +42,8 @@ namespace unocontrols{ ...@@ -42,8 +42,8 @@ namespace unocontrols{
struct IMPL_ControlInfo struct IMPL_ControlInfo
{ {
::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > xControl ; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > xControl;
OUString sName ; OUString sName;
}; };
class BaseContainerControl : public ::com::sun::star::awt::XControlModel class BaseContainerControl : public ::com::sun::star::awt::XControlModel
...@@ -415,9 +415,9 @@ private: ...@@ -415,9 +415,9 @@ private:
::std::vector< IMPL_ControlInfo* > maControlInfoList; ::std::vector< IMPL_ControlInfo* > maControlInfoList;
// list of references of XTabController to hold tab-order in this container // list of references of XTabController to hold tab-order in this container
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > > m_xTabControllerList ; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > > m_xTabControllerList;
::cppu::OMultiTypeInterfaceContainerHelper m_aListeners ; ::cppu::OMultiTypeInterfaceContainerHelper m_aListeners;
}; // class BaseContainerControl }; // class BaseContainerControl
......
...@@ -106,7 +106,7 @@ namespace unocontrols{ ...@@ -106,7 +106,7 @@ namespace unocontrols{
struct IMPL_MutexContainer struct IMPL_MutexContainer
{ {
// Is necassery to initialize "BaseControl" and make this class thread-safe. // Is necassery to initialize "BaseControl" and make this class thread-safe.
::osl::Mutex m_aMutex ; ::osl::Mutex m_aMutex;
}; };
class BaseControl : public ::com::sun::star::lang::XServiceInfo class BaseControl : public ::com::sun::star::lang::XServiceInfo
...@@ -431,7 +431,7 @@ public: ...@@ -431,7 +431,7 @@ public:
virtual sal_Bool SAL_CALL setModel( virtual sal_Bool SAL_CALL setModel(
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel
) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0 ; ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0;
/**_______________________________________________________________________________________________________ /**_______________________________________________________________________________________________________
@short - @short -
...@@ -1181,22 +1181,22 @@ private: ...@@ -1181,22 +1181,22 @@ private:
private: private:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xComponentContext ; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xComponentContext;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xDelegator ; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xDelegator;
OMRCListenerMultiplexerHelper* m_pMultiplexer ; // multiplex events OMRCListenerMultiplexerHelper* m_pMultiplexer; // multiplex events
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xMultiplexer ; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xMultiplexer;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xContext ; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xContext;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > m_xPeer ; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > m_xPeer;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xPeerWindow ; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xPeerWindow;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > m_xGraphicsView ; // graphics for ::com::sun::star::awt::XView-operations ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > m_xGraphicsView; // graphics for ::com::sun::star::awt::XView-operations
::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > m_xGraphicsPeer ; // graphics for painting on a peer ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > m_xGraphicsPeer; // graphics for painting on a peer
sal_Int32 m_nX ; // Position ... sal_Int32 m_nX; // Position ...
sal_Int32 m_nY ; sal_Int32 m_nY;
sal_Int32 m_nWidth ; // ... and size of window sal_Int32 m_nWidth; // ... and size of window
sal_Int32 m_nHeight ; sal_Int32 m_nHeight;
bool m_bVisible ; // Some state flags bool m_bVisible; // Some state flags
bool m_bInDesignMode ; bool m_bInDesignMode;
bool m_bEnable ; bool m_bEnable;
}; // class BaseControl }; // class BaseControl
......
...@@ -278,7 +278,7 @@ public: ...@@ -278,7 +278,7 @@ public:
*/ */
virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& aSource) virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& aSource)
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XFocusListener // XFocusListener
...@@ -297,7 +297,7 @@ public: ...@@ -297,7 +297,7 @@ public:
*/ */
virtual void SAL_CALL focusGained(const ::com::sun::star::awt::FocusEvent& aEvent ) virtual void SAL_CALL focusGained(const ::com::sun::star::awt::FocusEvent& aEvent )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
/**_______________________________________________________________________________________________________ /**_______________________________________________________________________________________________________
@short - @short -
...@@ -314,7 +314,7 @@ public: ...@@ -314,7 +314,7 @@ public:
*/ */
virtual void SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& aEvent ) virtual void SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& aEvent )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XWindowListener // XWindowListener
...@@ -333,7 +333,7 @@ public: ...@@ -333,7 +333,7 @@ public:
*/ */
virtual void SAL_CALL windowResized(const ::com::sun::star::awt::WindowEvent& aEvent ) virtual void SAL_CALL windowResized(const ::com::sun::star::awt::WindowEvent& aEvent )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
/**_______________________________________________________________________________________________________ /**_______________________________________________________________________________________________________
@short - @short -
...@@ -350,7 +350,7 @@ public: ...@@ -350,7 +350,7 @@ public:
*/ */
virtual void SAL_CALL windowMoved(const ::com::sun::star::awt::WindowEvent& aEvent ) virtual void SAL_CALL windowMoved(const ::com::sun::star::awt::WindowEvent& aEvent )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
/**_______________________________________________________________________________________________________ /**_______________________________________________________________________________________________________
@short - @short -
...@@ -367,7 +367,7 @@ public: ...@@ -367,7 +367,7 @@ public:
*/ */
virtual void SAL_CALL windowShown(const ::com::sun::star::lang::EventObject& aEvent ) virtual void SAL_CALL windowShown(const ::com::sun::star::lang::EventObject& aEvent )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
/**_______________________________________________________________________________________________________ /**_______________________________________________________________________________________________________
@short - @short -
...@@ -384,7 +384,7 @@ public: ...@@ -384,7 +384,7 @@ public:
*/ */
virtual void SAL_CALL windowHidden(const ::com::sun::star::lang::EventObject& aEvent ) virtual void SAL_CALL windowHidden(const ::com::sun::star::lang::EventObject& aEvent )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XKeyListener // XKeyListener
...@@ -403,7 +403,7 @@ public: ...@@ -403,7 +403,7 @@ public:
*/ */
virtual void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& aEvent ) virtual void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& aEvent )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
/**_______________________________________________________________________________________________________ /**_______________________________________________________________________________________________________
@short - @short -
...@@ -420,7 +420,7 @@ public: ...@@ -420,7 +420,7 @@ public:
*/ */
virtual void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& aEvent ) virtual void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& aEvent )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XMouseListener // XMouseListener
...@@ -439,7 +439,7 @@ public: ...@@ -439,7 +439,7 @@ public:
*/ */
virtual void SAL_CALL mousePressed(const ::com::sun::star::awt::MouseEvent& aEvent ) virtual void SAL_CALL mousePressed(const ::com::sun::star::awt::MouseEvent& aEvent )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
/**_______________________________________________________________________________________________________ /**_______________________________________________________________________________________________________
@short - @short -
...@@ -456,7 +456,7 @@ public: ...@@ -456,7 +456,7 @@ public:
*/ */
virtual void SAL_CALL mouseReleased(const ::com::sun::star::awt::MouseEvent& aEvent ) virtual void SAL_CALL mouseReleased(const ::com::sun::star::awt::MouseEvent& aEvent )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
/**_______________________________________________________________________________________________________ /**_______________________________________________________________________________________________________
@short - @short -
...@@ -473,7 +473,7 @@ public: ...@@ -473,7 +473,7 @@ public:
*/ */
virtual void SAL_CALL mouseEntered(const ::com::sun::star::awt::MouseEvent& aEvent ) virtual void SAL_CALL mouseEntered(const ::com::sun::star::awt::MouseEvent& aEvent )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
/**_______________________________________________________________________________________________________ /**_______________________________________________________________________________________________________
@short - @short -
...@@ -490,7 +490,7 @@ public: ...@@ -490,7 +490,7 @@ public:
*/ */
virtual void SAL_CALL mouseExited(const ::com::sun::star::awt::MouseEvent& aEvent ) virtual void SAL_CALL mouseExited(const ::com::sun::star::awt::MouseEvent& aEvent )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XMouseMotionListener // XMouseMotionListener
...@@ -509,7 +509,7 @@ public: ...@@ -509,7 +509,7 @@ public:
*/ */
virtual void SAL_CALL mouseDragged(const ::com::sun::star::awt::MouseEvent& aEvent ) virtual void SAL_CALL mouseDragged(const ::com::sun::star::awt::MouseEvent& aEvent )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
/**_______________________________________________________________________________________________________ /**_______________________________________________________________________________________________________
@short - @short -
...@@ -526,7 +526,7 @@ public: ...@@ -526,7 +526,7 @@ public:
*/ */
virtual void SAL_CALL mouseMoved(const ::com::sun::star::awt::MouseEvent& aEvent ) virtual void SAL_CALL mouseMoved(const ::com::sun::star::awt::MouseEvent& aEvent )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XPaintListener // XPaintListener
...@@ -545,7 +545,7 @@ public: ...@@ -545,7 +545,7 @@ public:
*/ */
virtual void SAL_CALL windowPaint(const ::com::sun::star::awt::PaintEvent& aEvent ) virtual void SAL_CALL windowPaint(const ::com::sun::star::awt::PaintEvent& aEvent )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XTopWindowListener // XTopWindowListener
...@@ -564,7 +564,7 @@ public: ...@@ -564,7 +564,7 @@ public:
*/ */
virtual void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& aEvent ) virtual void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& aEvent )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
/**_______________________________________________________________________________________________________ /**_______________________________________________________________________________________________________
@short - @short -
...@@ -581,7 +581,7 @@ public: ...@@ -581,7 +581,7 @@ public:
*/ */
virtual void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& aEvent ) virtual void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& aEvent )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
/**_______________________________________________________________________________________________________ /**_______________________________________________________________________________________________________
@short - @short -
...@@ -598,7 +598,7 @@ public: ...@@ -598,7 +598,7 @@ public:
*/ */
virtual void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& aEvent ) virtual void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& aEvent )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
/**_______________________________________________________________________________________________________ /**_______________________________________________________________________________________________________
@short - @short -
...@@ -615,7 +615,7 @@ public: ...@@ -615,7 +615,7 @@ public:
*/ */
virtual void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& aEvent ) virtual void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& aEvent )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
/**_______________________________________________________________________________________________________ /**_______________________________________________________________________________________________________
@short - @short -
...@@ -632,7 +632,7 @@ public: ...@@ -632,7 +632,7 @@ public:
*/ */
virtual void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& aEvent ) virtual void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& aEvent )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
/**_______________________________________________________________________________________________________ /**_______________________________________________________________________________________________________
@short - @short -
...@@ -649,7 +649,7 @@ public: ...@@ -649,7 +649,7 @@ public:
*/ */
virtual void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& aEvent ) virtual void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& aEvent )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
/**_______________________________________________________________________________________________________ /**_______________________________________________________________________________________________________
@short - @short -
...@@ -666,7 +666,7 @@ public: ...@@ -666,7 +666,7 @@ public:
*/ */
virtual void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& aEvent ) virtual void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& aEvent )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// protected methods // protected methods
...@@ -710,10 +710,10 @@ protected: ...@@ -710,10 +710,10 @@ protected:
private: private:
::osl::Mutex m_aMutex ; ::osl::Mutex m_aMutex;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xPeer ; /// The source of the events. Normally this is the peer object. ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xPeer; /// The source of the events. Normally this is the peer object.
::com::sun::star::uno::WeakReference< ::com::sun::star::awt::XWindow > m_xControl ; ::com::sun::star::uno::WeakReference< ::com::sun::star::awt::XWindow > m_xControl;
::cppu::OMultiTypeInterfaceContainerHelper m_aListenerHolder ; ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerHolder;
}; // class OMRCListenerMultiplexerHelper }; // class OMRCListenerMultiplexerHelper
......
...@@ -21,11 +21,11 @@ ...@@ -21,11 +21,11 @@
#include <osl/diagnose.h> #include <osl/diagnose.h>
using namespace ::cppu ; using namespace ::cppu;
using namespace ::osl ; using namespace ::osl;
using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::awt ; using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::lang ; using namespace ::com::sun::star::lang;
namespace unocontrols{ namespace unocontrols{
...@@ -42,7 +42,7 @@ namespace unocontrols{ ...@@ -42,7 +42,7 @@ namespace unocontrols{
EVENTTYP aLocalEvent = EVENT; \ EVENTTYP aLocalEvent = EVENT; \
/* Remark: The control is the event source not the peer.*/ \ /* Remark: The control is the event source not the peer.*/ \
/* We must change the source of the event. */ \ /* We must change the source of the event. */ \
aLocalEvent.Source = m_xControl ; \ aLocalEvent.Source = m_xControl; \
/* Is the control not destroyed? */ \ /* Is the control not destroyed? */ \
if( aLocalEvent.Source.is() ) \ if( aLocalEvent.Source.is() ) \
{ \ { \
...@@ -113,7 +113,7 @@ Any SAL_CALL OMRCListenerMultiplexerHelper::queryInterface( const Type& rType ) ...@@ -113,7 +113,7 @@ Any SAL_CALL OMRCListenerMultiplexerHelper::queryInterface( const Type& rType )
if ( aReturn.hasValue() ) if ( aReturn.hasValue() )
{ {
// ... return this information. // ... return this information.
return aReturn ; return aReturn;
} }
else else
{ {
...@@ -148,7 +148,7 @@ void SAL_CALL OMRCListenerMultiplexerHelper::release() throw() ...@@ -148,7 +148,7 @@ void SAL_CALL OMRCListenerMultiplexerHelper::release() throw()
OMRCListenerMultiplexerHelper::operator Reference< XInterface >() const OMRCListenerMultiplexerHelper::operator Reference< XInterface >() const
{ {
return ((OWeakObject*)this) ; return ((OWeakObject*)this);
} }
// container method // container method
...@@ -186,8 +186,8 @@ void OMRCListenerMultiplexerHelper::setPeer( const Reference< XWindow >& xPeer ) ...@@ -186,8 +186,8 @@ void OMRCListenerMultiplexerHelper::setPeer( const Reference< XWindow >& xPeer )
void OMRCListenerMultiplexerHelper::disposeAndClear() void OMRCListenerMultiplexerHelper::disposeAndClear()
{ {
EventObject aEvent ; EventObject aEvent;
aEvent.Source = m_xControl ; aEvent.Source = m_xControl;
m_aListenerHolder.disposeAndClear( aEvent ); m_aListenerHolder.disposeAndClear( aEvent );
} }
......
...@@ -23,11 +23,11 @@ ...@@ -23,11 +23,11 @@
// namespaces // namespaces
using namespace ::rtl ; using namespace ::rtl;
using namespace ::osl ; using namespace ::osl;
using namespace ::cppu ; using namespace ::cppu;
using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang ; using namespace ::com::sun::star::lang;
namespace unocontrols{ namespace unocontrols{
...@@ -63,7 +63,7 @@ Any SAL_CALL OConnectionPointContainerHelper::queryInterface( const Type& aType ...@@ -63,7 +63,7 @@ Any SAL_CALL OConnectionPointContainerHelper::queryInterface( const Type& aType
aReturn = OWeakObject::queryInterface( aType ); aReturn = OWeakObject::queryInterface( aType );
} }
return aReturn ; return aReturn;
} }
// XInterface // XInterface
...@@ -114,7 +114,7 @@ Reference< XConnectionPoint > SAL_CALL OConnectionPointContainerHelper::queryCon ...@@ -114,7 +114,7 @@ Reference< XConnectionPoint > SAL_CALL OConnectionPointContainerHelper::queryCon
xConnectionPoint = Reference< XConnectionPoint >( (OWeakObject*)pNewConnectionPoint, UNO_QUERY ); xConnectionPoint = Reference< XConnectionPoint >( (OWeakObject*)pNewConnectionPoint, UNO_QUERY );
} }
return xConnectionPoint ; return xConnectionPoint;
} }
// XConnectionPointContainer // XConnectionPointContainer
......
...@@ -23,11 +23,11 @@ ...@@ -23,11 +23,11 @@
// namespaces // namespaces
using namespace ::rtl ; using namespace ::rtl;
using namespace ::osl ; using namespace ::osl;
using namespace ::cppu ; using namespace ::cppu;
using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang ; using namespace ::com::sun::star::lang;
namespace unocontrols{ namespace unocontrols{
...@@ -68,7 +68,7 @@ Any SAL_CALL OConnectionPointHelper::queryInterface( const Type& aType ) throw( ...@@ -68,7 +68,7 @@ Any SAL_CALL OConnectionPointHelper::queryInterface( const Type& aType ) throw(
aReturn = OWeakObject::queryInterface( aType ); aReturn = OWeakObject::queryInterface( aType );
} }
return aReturn ; return aReturn;
} }
// XInterface // XInterface
...@@ -108,7 +108,7 @@ Type SAL_CALL OConnectionPointHelper::getConnectionType() throw( RuntimeExceptio ...@@ -108,7 +108,7 @@ Type SAL_CALL OConnectionPointHelper::getConnectionType() throw( RuntimeExceptio
} }
// If container reference valid, return right type of supported interfaces of THIS connectionpoint. // If container reference valid, return right type of supported interfaces of THIS connectionpoint.
Type aReturnType = m_aInterfaceType ; Type aReturnType = m_aInterfaceType;
// Don't forget this! // Don't forget this!
impl_UnlockContainer(); impl_UnlockContainer();
......
...@@ -211,8 +211,8 @@ public: ...@@ -211,8 +211,8 @@ public:
private: private:
::osl::Mutex& m_aSharedMutex ; ::osl::Mutex& m_aSharedMutex;
::cppu::OMultiTypeInterfaceContainerHelper m_aMultiTypeContainer ; // Container to hold listener ::cppu::OMultiTypeInterfaceContainerHelper m_aMultiTypeContainer; // Container to hold listener
}; // class OConnectionPointContainerHelper }; // class OConnectionPointContainerHelper
......
...@@ -250,12 +250,12 @@ private: ...@@ -250,12 +250,12 @@ private:
private: private:
::osl::Mutex& m_aSharedMutex ; ::osl::Mutex& m_aSharedMutex;
::com::sun::star::uno::WeakReference< ::com::sun::star::lang::XConnectionPointContainer > m_oContainerWeakReference ; // Reference to container-class!. Don't use Reference<...> ::com::sun::star::uno::WeakReference< ::com::sun::star::lang::XConnectionPointContainer > m_oContainerWeakReference; // Reference to container-class!. Don't use Reference<...>
// It is a ring-reference => and must be a wekreference! // It is a ring-reference => and must be a wekreference!
OConnectionPointContainerHelper* m_pContainerImplementation ; OConnectionPointContainerHelper* m_pContainerImplementation;
::com::sun::star::uno::Type m_aInterfaceType ; ::com::sun::star::uno::Type m_aInterfaceType;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xLock ; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xLock;
}; // class OConnectionPointHelper }; // class OConnectionPointHelper
......
...@@ -188,7 +188,7 @@ protected: ...@@ -188,7 +188,7 @@ protected:
) throw ( ::com::sun::star::uno::Exception, std::exception ) SAL_OVERRIDE; ) throw ( ::com::sun::star::uno::Exception, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue , virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue ,
sal_Int32 nHandle ) const SAL_OVERRIDE ; sal_Int32 nHandle ) const SAL_OVERRIDE;
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE;
...@@ -219,11 +219,11 @@ private: ...@@ -219,11 +219,11 @@ private:
private: private:
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame2 > m_xFrame ; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame2 > m_xFrame;
OUString m_sComponentURL ; OUString m_sComponentURL;
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_seqLoaderArguments ; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_seqLoaderArguments;
::cppu::OMultiTypeInterfaceContainerHelper m_aInterfaceContainer ; ::cppu::OMultiTypeInterfaceContainerHelper m_aInterfaceContainer;
OConnectionPointContainerHelper m_aConnectionPointContainer ; OConnectionPointContainerHelper m_aConnectionPointContainer;
}; // class FrameControl }; // class FrameControl
......
...@@ -382,14 +382,14 @@ protected: ...@@ -382,14 +382,14 @@ protected:
private: private:
bool m_bHorizontal ; // orientation for steps [true=horizontal/false=vertikal] bool m_bHorizontal; // orientation for steps [true=horizontal/false=vertikal]
::com::sun::star::awt::Size m_aBlockSize ; // width and height of a block [>=0,0] ::com::sun::star::awt::Size m_aBlockSize; // width and height of a block [>=0,0]
sal_Int32 m_nForegroundColor ; // (alpha,r,g,b) sal_Int32 m_nForegroundColor; // (alpha,r,g,b)
sal_Int32 m_nBackgroundColor ; // (alpha,r,g,b) sal_Int32 m_nBackgroundColor; // (alpha,r,g,b)
sal_Int32 m_nMinRange ; // lowest value = 0% [long, <_nMaxRange] sal_Int32 m_nMinRange; // lowest value = 0% [long, <_nMaxRange]
sal_Int32 m_nMaxRange ; // highest value = 100% [long, >_nMinRange] sal_Int32 m_nMaxRange; // highest value = 100% [long, >_nMinRange]
double m_nBlockValue ; // value for one block [long, >0] double m_nBlockValue; // value for one block [long, >0]
sal_Int32 m_nValue ; // value for progress [long] sal_Int32 m_nValue; // value for progress [long]
}; // class ProgressBar }; // class ProgressBar
......
...@@ -89,8 +89,8 @@ class ProgressBar; ...@@ -89,8 +89,8 @@ class ProgressBar;
/// Item of TextList /// Item of TextList
struct IMPL_TextlistItem struct IMPL_TextlistItem
{ {
OUString sTopic ; /// Left site of textline in dialog OUString sTopic; /// Left site of textline in dialog
OUString sText ; /// Right site of textline in dialog OUString sText; /// Right site of textline in dialog
}; };
// class declaration // class declaration
...@@ -715,16 +715,16 @@ private: ...@@ -715,16 +715,16 @@ private:
private: private:
::std::vector < IMPL_TextlistItem* > maTextlist_Top; // Elements before progress ::std::vector < IMPL_TextlistItem* > maTextlist_Top; // Elements before progress
::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText > m_xTopic_Top ; // (used, if parameter "beforeProgress"=sal_True in "addText, updateText, removeText") ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText > m_xTopic_Top; // (used, if parameter "beforeProgress"=sal_True in "addText, updateText, removeText")
::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText > m_xText_Top ; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText > m_xText_Top;
::std::vector < IMPL_TextlistItem* > maTextlist_Bottom; // Elements below of progress ::std::vector < IMPL_TextlistItem* > maTextlist_Bottom; // Elements below of progress
::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText > m_xTopic_Bottom ; // (used, if parameter "beforeProgress"=sal_False in "addText, updateText, removeText") ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText > m_xTopic_Bottom; // (used, if parameter "beforeProgress"=sal_False in "addText, updateText, removeText")
::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText > m_xText_Bottom ; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText > m_xText_Bottom;
rtl::Reference<ProgressBar> m_xProgressBar; rtl::Reference<ProgressBar> m_xProgressBar;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XButton > m_xButton ; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XButton > m_xButton;
::com::sun::star::awt::Rectangle m_a3DLine ; ::com::sun::star::awt::Rectangle m_a3DLine;
}; // class ProgressMonitor }; // class ProgressMonitor
......
...@@ -506,7 +506,7 @@ private: ...@@ -506,7 +506,7 @@ private:
private: private:
::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText > m_xText ; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText > m_xText;
rtl::Reference<ProgressBar> m_xProgressBar; rtl::Reference<ProgressBar> m_xProgressBar;
}; // class StatusIndicator }; // class StatusIndicator
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment