diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-04-06 19:55:59 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-04-06 20:00:28 +0300 |
commit | fdecbd4a415ef8d08d16321beb6567919bd8e864 (patch) | |
tree | 20cfce39605bbdf31727656a88f470bd1cb13c60 /UnoControls/inc | |
parent | 5814e764328e93c7618d384225fe6c7d628aa3c9 (diff) |
Kill superfluous spacing before semicolons
Change-Id: I2c5c2c2e8c57796d147141748fb57a4c5645a96a
Diffstat (limited to 'UnoControls/inc')
-rw-r--r-- | UnoControls/inc/basecontainercontrol.hxx | 8 | ||||
-rw-r--r-- | UnoControls/inc/basecontrol.hxx | 36 | ||||
-rw-r--r-- | UnoControls/inc/multiplexer.hxx | 54 |
3 files changed, 49 insertions, 49 deletions
diff --git a/UnoControls/inc/basecontainercontrol.hxx b/UnoControls/inc/basecontainercontrol.hxx index 47a20af2a928..0408cb92060a 100644 --- a/UnoControls/inc/basecontainercontrol.hxx +++ b/UnoControls/inc/basecontainercontrol.hxx @@ -42,8 +42,8 @@ namespace unocontrols{ struct IMPL_ControlInfo { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > xControl ; - OUString sName ; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > xControl; + OUString sName; }; class BaseContainerControl : public ::com::sun::star::awt::XControlModel @@ -415,9 +415,9 @@ private: ::std::vector< IMPL_ControlInfo* > maControlInfoList; // 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 diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx index 72ab5a33cbe6..45ca1b2530f8 100644 --- a/UnoControls/inc/basecontrol.hxx +++ b/UnoControls/inc/basecontrol.hxx @@ -106,7 +106,7 @@ namespace unocontrols{ struct IMPL_MutexContainer { // 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 @@ -431,7 +431,7 @@ public: virtual sal_Bool SAL_CALL setModel( 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 - @@ -1181,22 +1181,22 @@ private: private: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xComponentContext ; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xDelegator ; - 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_xContext ; - ::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::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 - sal_Int32 m_nX ; // Position ... - sal_Int32 m_nY ; - sal_Int32 m_nWidth ; // ... and size of window - sal_Int32 m_nHeight ; - bool m_bVisible ; // Some state flags - bool m_bInDesignMode ; - bool m_bEnable ; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xComponentContext; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xDelegator; + 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_xContext; + ::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::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 + sal_Int32 m_nX; // Position ... + sal_Int32 m_nY; + sal_Int32 m_nWidth; // ... and size of window + sal_Int32 m_nHeight; + bool m_bVisible; // Some state flags + bool m_bInDesignMode; + bool m_bEnable; }; // class BaseControl diff --git a/UnoControls/inc/multiplexer.hxx b/UnoControls/inc/multiplexer.hxx index f6e85c853a20..21c76dec0847 100644 --- a/UnoControls/inc/multiplexer.hxx +++ b/UnoControls/inc/multiplexer.hxx @@ -278,7 +278,7 @@ public: */ 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 @@ -297,7 +297,7 @@ public: */ 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 - @@ -314,7 +314,7 @@ public: */ 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 @@ -333,7 +333,7 @@ public: */ 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 - @@ -350,7 +350,7 @@ public: */ 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 - @@ -367,7 +367,7 @@ public: */ 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 - @@ -384,7 +384,7 @@ public: */ 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 @@ -403,7 +403,7 @@ public: */ 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 - @@ -420,7 +420,7 @@ public: */ 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 @@ -439,7 +439,7 @@ public: */ 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 - @@ -456,7 +456,7 @@ public: */ 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 - @@ -473,7 +473,7 @@ public: */ 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 - @@ -490,7 +490,7 @@ public: */ 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 @@ -509,7 +509,7 @@ public: */ 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 - @@ -526,7 +526,7 @@ public: */ 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 @@ -545,7 +545,7 @@ public: */ 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 @@ -564,7 +564,7 @@ public: */ 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 - @@ -581,7 +581,7 @@ public: */ 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 - @@ -598,7 +598,7 @@ public: */ 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 - @@ -615,7 +615,7 @@ public: */ 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 - @@ -632,7 +632,7 @@ public: */ 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 - @@ -649,7 +649,7 @@ public: */ 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 - @@ -666,7 +666,7 @@ public: */ 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 @@ -710,10 +710,10 @@ protected: private: - ::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::WeakReference< ::com::sun::star::awt::XWindow > m_xControl ; - ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerHolder ; + ::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::WeakReference< ::com::sun::star::awt::XWindow > m_xControl; + ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerHolder; }; // class OMRCListenerMultiplexerHelper |