diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-04-06 19:54:59 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-04-06 20:00:27 +0300 |
commit | 5814e764328e93c7618d384225fe6c7d628aa3c9 (patch) | |
tree | 534b6eeed8e60bd9290b21e2f748f8a732a653e6 /UnoControls/inc | |
parent | 149e3d4212704b36c101c2cab11cb43ad633ddd5 (diff) |
Kill superfluous vertical whitespace
Change-Id: Ieb7956acdc24d6b18939e916e33eb12dc268e778
Diffstat (limited to 'UnoControls/inc')
-rw-r--r-- | UnoControls/inc/basecontainercontrol.hxx | 30 | ||||
-rw-r--r-- | UnoControls/inc/basecontrol.hxx | 39 | ||||
-rw-r--r-- | UnoControls/inc/multiplexer.hxx | 34 |
3 files changed, 0 insertions, 103 deletions
diff --git a/UnoControls/inc/basecontainercontrol.hxx b/UnoControls/inc/basecontainercontrol.hxx index fcd7d97c8b69..47a20af2a928 100644 --- a/UnoControls/inc/basecontainercontrol.hxx +++ b/UnoControls/inc/basecontainercontrol.hxx @@ -34,16 +34,12 @@ #include "basecontrol.hxx" - // "namespaces" - namespace unocontrols{ - // structs, types, forwards - struct IMPL_ControlInfo { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > xControl ; @@ -55,16 +51,12 @@ class BaseContainerControl : public ::com::sun::star::awt::XControlModel , public BaseControl { - // public methods - public: - // construct/destruct - /**_______________________________________________________________________________________________________ @short - @descr - @@ -95,10 +87,8 @@ public: virtual ~BaseContainerControl(); - // XInterface - /**_______________________________________________________________________________________________________ @short give answer, if interface is supported @descr The interfaces are searched by type. @@ -116,10 +106,8 @@ public: const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XTypeProvider - /**_______________________________________________________________________________________________________ @short get information about supported interfaces @descr - @@ -136,10 +124,8 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XAggregation - /**_______________________________________________________________________________________________________ @short - @descr - @@ -157,10 +143,8 @@ public: const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XControl - /**_______________________________________________________________________________________________________ @short - @descr - @@ -212,10 +196,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XComponent - /**_______________________________________________________________________________________________________ @short - @descr - @@ -231,10 +213,8 @@ public: virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XEventListener - /**_______________________________________________________________________________________________________ @short - @descr - @@ -250,10 +230,8 @@ public: virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XControlContainer - /**_______________________________________________________________________________________________________ @short - @descr - @@ -339,10 +317,8 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > > SAL_CALL getControls() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XWindow - /**_______________________________________________________________________________________________________ @short - @descr - @@ -358,10 +334,8 @@ public: virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // protected methods - protected: using OComponentHelper::disposing; /**_______________________________________________________________________________________________________ @@ -400,10 +374,8 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics ) SAL_OVERRIDE; - // private methods - private: /**_______________________________________________________________________________________________________ @@ -436,10 +408,8 @@ private: void impl_cleanMemory(); - // private variables - private: // list of pointer of "struct IMPL_ControlInfo" to hold child-controls ::std::vector< IMPL_ControlInfo* > maControlInfoList; diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx index d4efe7188a46..72ab5a33cbe6 100644 --- a/UnoControls/inc/basecontrol.hxx +++ b/UnoControls/inc/basecontrol.hxx @@ -92,23 +92,17 @@ namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } - // "namespaces" - namespace unocontrols{ - // macros - #define TRGB_COLORDATA(TRANSPARENCE,RED,GREEN,BLUE) \ ((sal_Int32)(((sal_uInt32)((sal_uInt8)(BLUE))))|(((sal_uInt32)((sal_uInt8)(GREEN)))<<8)|(((sal_uInt32)((sal_uInt8)(RED)))<<16)|(((sal_uInt32)((sal_uInt8)(TRANSPARENCE)))<<24)) - // structs - struct IMPL_MutexContainer { // Is necassery to initialize "BaseControl" and make this class thread-safe. @@ -127,13 +121,10 @@ class BaseControl : public ::com::sun::star::lang::XServiceInfo // public methods - public: - // construct/destruct - /**_______________________________________________________________________________________________________ @short - @descr - @@ -164,10 +155,8 @@ public: virtual ~BaseControl(); - // XInterface - /**_______________________________________________________________________________________________________ @short give answer, if interface is supported @descr The interfaces are searched by type. @@ -217,10 +206,8 @@ public: virtual void SAL_CALL release() throw() SAL_OVERRIDE; - // XTypeProvider - /**_______________________________________________________________________________________________________ @short get information about supported interfaces @descr - @@ -254,10 +241,8 @@ public: virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XAggregation - /**_______________________________________________________________________________________________________ @short - @descr - @@ -292,10 +277,8 @@ public: const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XServiceInfo - /**_______________________________________________________________________________________________________ @short - @descr - @@ -345,10 +328,8 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XComponent - /**_______________________________________________________________________________________________________ @short - @descr - @@ -398,10 +379,8 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XControl - /**_______________________________________________________________________________________________________ @short - @descr - @@ -563,10 +542,8 @@ public: virtual sal_Bool SAL_CALL isTransparent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XWindow - /**_______________________________________________________________________________________________________ @short - @descr - @@ -850,10 +827,8 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XView - /**_______________________________________________________________________________________________________ @short - @descr - @@ -934,10 +909,8 @@ public: virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // ::com::sun::star::lang::XEventListener - /**_______________________________________________________________________________________________________ @short - @descr - @@ -955,10 +928,8 @@ public: const ::com::sun::star::lang::EventObject& rSource ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XPaintListener - /**_______________________________________________________________________________________________________ @short - @descr - @@ -976,10 +947,8 @@ public: const ::com::sun::star::awt::PaintEvent& rEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XWindowListener - /**_______________________________________________________________________________________________________ @short - @descr - @@ -998,10 +967,8 @@ public: virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // impl but public method to register service - /**_______________________________________________________________________________________________________ @short - @descr - @@ -1032,10 +999,8 @@ public: static const OUString impl_getStaticImplementationName(); - // protected methods - protected: using OComponentHelper::disposing; @@ -1178,10 +1143,8 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > impl_getDelegator(); - // private methods - private: /**_______________________________________________________________________________________________________ @@ -1214,10 +1177,8 @@ private: OMRCListenerMultiplexerHelper* impl_getMultiplexer(); - // private variables - private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xComponentContext ; diff --git a/UnoControls/inc/multiplexer.hxx b/UnoControls/inc/multiplexer.hxx index b726bcd762fc..f6e85c853a20 100644 --- a/UnoControls/inc/multiplexer.hxx +++ b/UnoControls/inc/multiplexer.hxx @@ -46,16 +46,12 @@ #include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.hxx> - // "namespaces" - namespace unocontrols{ - // class - class OMRCListenerMultiplexerHelper : public ::com::sun::star::awt::XFocusListener , public ::com::sun::star::awt::XWindowListener , public ::com::sun::star::awt::XKeyListener @@ -66,16 +62,12 @@ class OMRCListenerMultiplexerHelper : public ::com::sun::star::awt::XFocusListen , public ::cppu::OWeakObject { - // public methods - public: - // construct/destruct - /**_______________________________________________________________________________________________________ @short constructor @descr Create a Multiplexer of XWindowEvents. @@ -123,10 +115,8 @@ public: virtual ~OMRCListenerMultiplexerHelper(); - // XInterface - /**_______________________________________________________________________________________________________ @short give answer, if interface is supported @descr The interfaces are searched by type. @@ -175,10 +165,8 @@ public: virtual void SAL_CALL release() throw() SAL_OVERRIDE; - // operator - /**_______________________________________________________________________________________________________ @short - @descr - @@ -209,10 +197,8 @@ public: OMRCListenerMultiplexerHelper& operator= ( const OMRCListenerMultiplexerHelper& aCopyInstance ); - // container methods - /**_______________________________________________________________________________________________________ @short Remove all listeners from the previous set peer and add the needed listeners to rPeer. @descr - @@ -275,10 +261,8 @@ public: void unadvise( const ::com::sun::star::uno::Type& aType , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener ); - // XEventListener - /**_______________________________________________________________________________________________________ @short - @descr - @@ -296,10 +280,8 @@ public: virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& aSource) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; - // XFocusListener - /**_______________________________________________________________________________________________________ @short - @descr - @@ -334,10 +316,8 @@ public: virtual void SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; - // XWindowListener - /**_______________________________________________________________________________________________________ @short - @descr - @@ -406,10 +386,8 @@ public: virtual void SAL_CALL windowHidden(const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; - // XKeyListener - /**_______________________________________________________________________________________________________ @short - @descr - @@ -444,10 +422,8 @@ public: virtual void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; - // XMouseListener - /**_______________________________________________________________________________________________________ @short - @descr - @@ -516,10 +492,8 @@ public: virtual void SAL_CALL mouseExited(const ::com::sun::star::awt::MouseEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; - // XMouseMotionListener - /**_______________________________________________________________________________________________________ @short - @descr - @@ -554,10 +528,8 @@ public: virtual void SAL_CALL mouseMoved(const ::com::sun::star::awt::MouseEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; - // XPaintListener - /**_______________________________________________________________________________________________________ @short - @descr - @@ -575,10 +547,8 @@ public: virtual void SAL_CALL windowPaint(const ::com::sun::star::awt::PaintEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; - // XTopWindowListener - /**_______________________________________________________________________________________________________ @short - @descr - @@ -698,10 +668,8 @@ public: virtual void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; - // protected methods - protected: /**_______________________________________________________________________________________________________ @@ -738,10 +706,8 @@ protected: void impl_unadviseFromPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& xPeer , const ::com::sun::star::uno::Type& aType ); - // private variables - private: ::osl::Mutex m_aMutex ; |