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 | |
| parent | 149e3d4212704b36c101c2cab11cb43ad633ddd5 (diff) | |
Kill superfluous vertical whitespace
Change-Id: Ieb7956acdc24d6b18939e916e33eb12dc268e778
Diffstat (limited to 'UnoControls')
| -rw-r--r-- | UnoControls/inc/basecontainercontrol.hxx | 30 | ||||
| -rw-r--r-- | UnoControls/inc/basecontrol.hxx | 39 | ||||
| -rw-r--r-- | UnoControls/inc/multiplexer.hxx | 34 | ||||
| -rw-r--r-- | UnoControls/source/base/basecontainercontrol.cxx | 40 | ||||
| -rw-r--r-- | UnoControls/source/base/basecontrol.cxx | 128 | ||||
| -rw-r--r-- | UnoControls/source/base/multiplexer.cxx | 70 | ||||
| -rw-r--r-- | UnoControls/source/controls/OConnectionPointContainerHelper.cxx | 20 | ||||
| -rw-r--r-- | UnoControls/source/controls/OConnectionPointHelper.cxx | 24 | ||||
| -rw-r--r-- | UnoControls/source/controls/framecontrol.cxx | 58 | ||||
| -rw-r--r-- | UnoControls/source/controls/progressbar.cxx | 36 | ||||
| -rw-r--r-- | UnoControls/source/controls/statusindicator.cxx | 48 | ||||
| -rw-r--r-- | UnoControls/source/inc/OConnectionPointContainerHelper.hxx | 14 | ||||
| -rw-r--r-- | UnoControls/source/inc/OConnectionPointHelper.hxx | 16 | ||||
| -rw-r--r-- | UnoControls/source/inc/framecontrol.hxx | 36 | ||||
| -rw-r--r-- | UnoControls/source/inc/progressbar.hxx | 24 | ||||
| -rw-r--r-- | UnoControls/source/inc/progressmonitor.hxx | 37 | ||||
| -rw-r--r-- | UnoControls/source/inc/statusindicator.hxx | 32 |
17 files changed, 0 insertions, 686 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 ; diff --git a/UnoControls/source/base/basecontainercontrol.cxx b/UnoControls/source/base/basecontainercontrol.cxx index 37ca44480989..00d63052fbc1 100644 --- a/UnoControls/source/base/basecontainercontrol.cxx +++ b/UnoControls/source/base/basecontainercontrol.cxx @@ -21,10 +21,8 @@ #include <cppuhelper/typeprovider.hxx> - // namespaces - using namespace ::cppu ; using namespace ::osl ; using namespace ::rtl ; @@ -35,10 +33,8 @@ using namespace ::com::sun::star::container ; namespace unocontrols{ - // construct/destruct - BaseContainerControl::BaseContainerControl( const Reference< XComponentContext >& rxContext ) : BaseControl ( rxContext ) , m_aListeners ( m_aMutex ) @@ -50,10 +46,8 @@ BaseContainerControl::~BaseContainerControl() impl_cleanMemory(); } - // XInterface - Any SAL_CALL BaseContainerControl::queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) { // Attention: @@ -75,10 +69,8 @@ Any SAL_CALL BaseContainerControl::queryInterface( const Type& rType ) throw( Ru return aReturn ; } - // XTypeProvider - Sequence< Type > SAL_CALL BaseContainerControl::getTypes() throw( RuntimeException, std::exception ) { // Optimize this method ! @@ -107,10 +99,8 @@ Sequence< Type > SAL_CALL BaseContainerControl::getTypes() throw( RuntimeExcepti return pTypeCollection->getTypes(); } - // XAggregation - Any SAL_CALL BaseContainerControl::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception ) { // Ask for my own supported interfaces ... @@ -134,10 +124,8 @@ Any SAL_CALL BaseContainerControl::queryAggregation( const Type& aType ) throw( } } - // XControl - void SAL_CALL BaseContainerControl::createPeer( const Reference< XToolkit >& xToolkit , const Reference< XWindowPeer >& xParent ) throw( RuntimeException, std::exception ) { @@ -161,20 +149,16 @@ void SAL_CALL BaseContainerControl::createPeer( const Reference< XToolkit >& } } - // XControl - sal_Bool SAL_CALL BaseContainerControl::setModel( const Reference< XControlModel >& ) throw( RuntimeException, std::exception ) { // This object has NO model. return sal_False ; } - // XControl - Reference< XControlModel > SAL_CALL BaseContainerControl::getModel() throw( RuntimeException, std::exception ) { // This object has NO model. @@ -182,10 +166,8 @@ Reference< XControlModel > SAL_CALL BaseContainerControl::getModel() throw( Runt return Reference< XControlModel >(); } - // XComponent - void SAL_CALL BaseContainerControl::dispose() throw( RuntimeException, std::exception ) { // Tell everything that this container is now gone. @@ -223,10 +205,8 @@ void SAL_CALL BaseContainerControl::dispose() throw( RuntimeException, std::exce BaseControl::dispose(); } - // XEventListener - void SAL_CALL BaseContainerControl::disposing( const EventObject& rEvent ) throw( RuntimeException, std::exception ) { Reference< XControl > xControl( rEvent.Source, UNO_QUERY ); @@ -235,10 +215,8 @@ void SAL_CALL BaseContainerControl::disposing( const EventObject& rEvent ) throw removeControl( xControl ); } - // XControlContainer - void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Reference< XControl > & rControl ) throw( RuntimeException, std::exception ) { if ( !rControl.is () ) @@ -294,10 +272,8 @@ void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Re } } - // XControlContainer - void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl > & rControl ) throw( RuntimeException, std::exception ) { if ( rControl.is() ) @@ -347,10 +323,8 @@ void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl > } } - // XControlContainer - void SAL_CALL BaseContainerControl::setStatusText ( const OUString& rStatusText ) throw( RuntimeException, std::exception ) { // go down to each parent @@ -362,10 +336,8 @@ void SAL_CALL BaseContainerControl::setStatusText ( const OUString& rStatusText } } - // XControlContainer - Reference< XControl > SAL_CALL BaseContainerControl::getControl ( const OUString& rName ) throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -390,10 +362,8 @@ Reference< XControl > SAL_CALL BaseContainerControl::getControl ( const OUString return Reference< XControl > () ; } - // XControlContainer - Sequence< Reference< XControl > > SAL_CALL BaseContainerControl::getControls () throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -415,10 +385,8 @@ Sequence< Reference< XControl > > SAL_CALL BaseContainerControl::getControls () return aDescriptor ; } - // XWindow - void SAL_CALL BaseContainerControl::setVisible ( sal_Bool bVisible ) throw( RuntimeException, std::exception ) { // override baseclass definition @@ -432,10 +400,8 @@ void SAL_CALL BaseContainerControl::setVisible ( sal_Bool bVisible ) throw( Runt } } - // protected method - WindowDescriptor* BaseContainerControl::impl_getWindowDescriptor ( const Reference< XWindowPeer > & rParentPeer ) { // - used from "createPeer()" to set the values of an WindowDescriptor !!! @@ -454,18 +420,14 @@ WindowDescriptor* BaseContainerControl::impl_getWindowDescriptor ( const Referen return aDescriptor ; } - // protected method - void BaseContainerControl::impl_paint ( sal_Int32 /*nX*/, sal_Int32 /*nY*/, const Reference< XGraphics > & /*rGraphics*/ ) { } - // private method - void BaseContainerControl::impl_activateTabControllers () { // Ready for multithreading @@ -481,10 +443,8 @@ void BaseContainerControl::impl_activateTabControllers () } } - // private method - void BaseContainerControl::impl_cleanMemory () { // Get count of listitems. diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx index c2ac982180a3..c60a999e75e9 100644 --- a/UnoControls/source/base/basecontrol.cxx +++ b/UnoControls/source/base/basecontrol.cxx @@ -29,10 +29,8 @@ #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> - // namespaces - using namespace ::cppu ; using namespace ::osl ; using namespace ::rtl ; @@ -51,10 +49,8 @@ namespace unocontrols{ #define DEFAULT_INDESIGNMODE false #define DEFAULT_ENABLE true - // construct/destruct - BaseControl::BaseControl( const Reference< XComponentContext >& rxContext ) : IMPL_MutexContainer ( ) , OComponentHelper ( m_aMutex ) @@ -74,10 +70,8 @@ BaseControl::~BaseControl() { } - // XInterface - Any SAL_CALL BaseControl::queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) { Any aReturn ; @@ -96,10 +90,8 @@ Any SAL_CALL BaseControl::queryInterface( const Type& rType ) throw( RuntimeExce return aReturn ; } - // XInterface - void SAL_CALL BaseControl::acquire() throw() { // Attention: @@ -109,10 +101,8 @@ void SAL_CALL BaseControl::acquire() throw() OComponentHelper::acquire(); } - // XInterface - void SAL_CALL BaseControl::release() throw() { // Attention: @@ -122,10 +112,8 @@ void SAL_CALL BaseControl::release() throw() OComponentHelper::release(); } - // XTypeProvider - Sequence< Type > SAL_CALL BaseControl::getTypes() throw( RuntimeException, std::exception ) { // Optimize this method ! @@ -159,19 +147,15 @@ Sequence< Type > SAL_CALL BaseControl::getTypes() throw( RuntimeException, std:: return pTypeCollection->getTypes(); } - // XTypeProvider - Sequence< sal_Int8 > SAL_CALL BaseControl::getImplementationId() throw( RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } - // XAggregation - void SAL_CALL BaseControl::setDelegator( const Reference< XInterface >& xDel ) throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -179,10 +163,8 @@ void SAL_CALL BaseControl::setDelegator( const Reference< XInterface >& xDel ) t m_xDelegator = xDel; } - // XAggregation - Any SAL_CALL BaseControl::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception ) { // Ask for my own supported interfaces ... @@ -210,37 +192,29 @@ Any SAL_CALL BaseControl::queryAggregation( const Type& aType ) throw( RuntimeEx } } - // XServiceInfo - OUString SAL_CALL BaseControl::getImplementationName() throw( RuntimeException, std::exception ) { return impl_getStaticImplementationName(); } - // XServiceInfo - sal_Bool SAL_CALL BaseControl::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, sServiceName); } - // XServiceInfo - Sequence< OUString > SAL_CALL BaseControl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { return impl_getStaticSupportedServiceNames(); } - // XComponent - void SAL_CALL BaseControl::dispose() throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -266,10 +240,8 @@ void SAL_CALL BaseControl::dispose() throw( RuntimeException, std::exception ) } } - // XComponent - void SAL_CALL BaseControl::addEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -277,10 +249,8 @@ void SAL_CALL BaseControl::addEventListener( const Reference< XEventListener >& OComponentHelper::addEventListener( xListener ); } - // XComponent - void SAL_CALL BaseControl::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -288,10 +258,8 @@ void SAL_CALL BaseControl::removeEventListener( const Reference< XEventListener OComponentHelper::removeEventListener( xListener ); } - // XControl - void SAL_CALL BaseControl::createPeer( const Reference< XToolkit >& xToolkit , const Reference< XWindowPeer >& xParentPeer ) throw( RuntimeException, std::exception ) { @@ -351,10 +319,8 @@ void SAL_CALL BaseControl::createPeer( const Reference< XToolkit >& xToo } } - // XControl - void SAL_CALL BaseControl::setContext( const Reference< XInterface >& xContext ) throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -362,10 +328,8 @@ void SAL_CALL BaseControl::setContext( const Reference< XInterface >& xContext ) m_xContext = xContext ; } - // XControl - void SAL_CALL BaseControl::setDesignMode( sal_Bool bOn ) throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -373,10 +337,8 @@ void SAL_CALL BaseControl::setDesignMode( sal_Bool bOn ) throw( RuntimeException m_bInDesignMode = bOn ; } - // XControl - Reference< XInterface > SAL_CALL BaseControl::getContext() throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -384,10 +346,8 @@ Reference< XInterface > SAL_CALL BaseControl::getContext() throw( RuntimeExcepti return m_xContext ; } - // XControl - Reference< XWindowPeer > SAL_CALL BaseControl::getPeer() throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -395,10 +355,8 @@ Reference< XWindowPeer > SAL_CALL BaseControl::getPeer() throw( RuntimeException return m_xPeer ; } - // XControl - Reference< XView > SAL_CALL BaseControl::getView() throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -406,10 +364,8 @@ Reference< XView > SAL_CALL BaseControl::getView() throw( RuntimeException, std: return Reference< XView >( (OWeakObject*)this, UNO_QUERY ); } - // XControl - sal_Bool SAL_CALL BaseControl::isDesignMode() throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -417,19 +373,15 @@ sal_Bool SAL_CALL BaseControl::isDesignMode() throw( RuntimeException, std::exce return m_bInDesignMode ; } - // XControl - sal_Bool SAL_CALL BaseControl::isTransparent() throw( RuntimeException, std::exception ) { return sal_False ; } - // XWindow - void SAL_CALL BaseControl::setPosSize( sal_Int32 nX , sal_Int32 nY , sal_Int32 nWidth , @@ -469,10 +421,8 @@ void SAL_CALL BaseControl::setPosSize( sal_Int32 nX , } } - // XWindow - void SAL_CALL BaseControl::setVisible( sal_Bool bVisible ) throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -488,10 +438,8 @@ void SAL_CALL BaseControl::setVisible( sal_Bool bVisible ) throw( RuntimeExcepti } } - // XWindow - void SAL_CALL BaseControl::setEnable( sal_Bool bEnable ) throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -507,10 +455,8 @@ void SAL_CALL BaseControl::setEnable( sal_Bool bEnable ) throw( RuntimeException } } - // XWindow - void SAL_CALL BaseControl::setFocus() throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -522,10 +468,8 @@ void SAL_CALL BaseControl::setFocus() throw( RuntimeException, std::exception ) } } - // XWindow - Rectangle SAL_CALL BaseControl::getPosSize() throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -533,118 +477,92 @@ Rectangle SAL_CALL BaseControl::getPosSize() throw( RuntimeException, std::excep return Rectangle( m_nX, m_nY , m_nWidth, m_nHeight ); } - // XWindow - void SAL_CALL BaseControl::addWindowListener( const Reference< XWindowListener >& xListener ) throw( RuntimeException, std::exception ) { impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XWindowListener >*)0), xListener ); } - // XWindow - void SAL_CALL BaseControl::addFocusListener( const Reference< XFocusListener >& xListener ) throw( RuntimeException, std::exception ) { impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XFocusListener >*)0), xListener ); } - // XWindow - void SAL_CALL BaseControl::addKeyListener( const Reference< XKeyListener >& xListener ) throw( RuntimeException, std::exception ) { impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XKeyListener >*)0), xListener ); } - // XWindow - void SAL_CALL BaseControl::addMouseListener( const Reference< XMouseListener >& xListener ) throw( RuntimeException, std::exception ) { impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XMouseListener >*)0), xListener ); } - // XWindow - void SAL_CALL BaseControl::addMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) throw( RuntimeException, std::exception ) { impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XMouseMotionListener >*)0), xListener ); } - // XWindow - void SAL_CALL BaseControl::addPaintListener( const Reference< XPaintListener >& xListener ) throw( RuntimeException, std::exception ) { impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XPaintListener >*)0), xListener ); } - // XWindow - void SAL_CALL BaseControl::removeWindowListener( const Reference< XWindowListener >& xListener ) throw( RuntimeException, std::exception ) { impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XWindowListener >*)0), xListener ); } - // XWindow - void SAL_CALL BaseControl::removeFocusListener( const Reference< XFocusListener >& xListener ) throw( RuntimeException, std::exception ) { impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XFocusListener >*)0), xListener ); } - // XWindow - void SAL_CALL BaseControl::removeKeyListener( const Reference< XKeyListener >& xListener ) throw( RuntimeException, std::exception ) { impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XKeyListener >*)0), xListener ); } - // XWindow - void SAL_CALL BaseControl::removeMouseListener( const Reference< XMouseListener >& xListener ) throw( RuntimeException, std::exception ) { impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XMouseListener >*)0), xListener ); } - // XWindow - void SAL_CALL BaseControl::removeMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) throw( RuntimeException, std::exception ) { impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XMouseMotionListener >*)0), xListener ); } - // XWindow - void SAL_CALL BaseControl::removePaintListener( const Reference< XPaintListener >& xListener ) throw( RuntimeException, std::exception ) { impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XPaintListener >*)0), xListener ); } - // XView - void SAL_CALL BaseControl::draw( sal_Int32 nX , sal_Int32 nY ) throw( RuntimeException, std::exception ) { @@ -657,10 +575,8 @@ void SAL_CALL BaseControl::draw( sal_Int32 nX , impl_paint( nX, nY, m_xGraphicsView ); } - // XView - sal_Bool SAL_CALL BaseControl::setGraphics( const Reference< XGraphics >& xDevice ) throw( RuntimeException, std::exception ) { // - set the graphics for an view @@ -679,20 +595,16 @@ sal_Bool SAL_CALL BaseControl::setGraphics( const Reference< XGraphics >& xDevic return bReturn ; } - // XView - void SAL_CALL BaseControl::setZoom( float /*fZoomX*/ , float /*fZoomY*/ ) throw( RuntimeException, std::exception ) { // Not implemented yet } - // XView - Reference< XGraphics > SAL_CALL BaseControl::getGraphics() throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -700,10 +612,8 @@ Reference< XGraphics > SAL_CALL BaseControl::getGraphics() throw( RuntimeExcepti return m_xGraphicsView ; } - // XView - Size SAL_CALL BaseControl::getSize() throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -711,10 +621,8 @@ Size SAL_CALL BaseControl::getSize() throw( RuntimeException, std::exception ) return Size( m_nWidth, m_nHeight ); } - // XEventListener - void SAL_CALL BaseControl::disposing( const EventObject& /*aSource*/ ) throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -735,10 +643,8 @@ void SAL_CALL BaseControl::disposing( const EventObject& /*aSource*/ ) throw( Ru } } - // XPaintListener - void SAL_CALL BaseControl::windowPaint( const PaintEvent& /*aEvent*/ ) throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -750,10 +656,8 @@ void SAL_CALL BaseControl::windowPaint( const PaintEvent& /*aEvent*/ ) throw( Ru impl_paint( 0, 0, m_xGraphicsPeer ); } - // XWindowListener - void SAL_CALL BaseControl::windowResized( const WindowEvent& aEvent ) throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -767,10 +671,8 @@ void SAL_CALL BaseControl::windowResized( const WindowEvent& aEvent ) throw( Run impl_recalcLayout( aMappedEvent ); } - // XWindowListener - void SAL_CALL BaseControl::windowMoved( const WindowEvent& aEvent ) throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -784,91 +686,71 @@ void SAL_CALL BaseControl::windowMoved( const WindowEvent& aEvent ) throw( Runti impl_recalcLayout( aMappedEvent ); } - // XWindowListener - void SAL_CALL BaseControl::windowShown( const EventObject& /*aEvent*/ ) throw( RuntimeException, std::exception ) { } - // XWindowListener - void SAL_CALL BaseControl::windowHidden( const EventObject& /*aEvent*/ ) throw( RuntimeException, std::exception ) { } - // impl but public method to register service in DLL // (In this BASE-implementation not implemented! Overwrite it in derived classes.) - const Sequence< OUString > BaseControl::impl_getStaticSupportedServiceNames() { return Sequence< OUString >(); } - // impl but public method to register service in DLL // (In this BASE-implementation not implemented! Overwrite it in derived classes.) - const OUString BaseControl::impl_getStaticImplementationName() { return OUString(); } - // protected method - const Reference< XComponentContext > BaseControl::impl_getComponentContext() { return m_xComponentContext ; } - // protected method - const Reference< XWindow > BaseControl::impl_getPeerWindow() { return m_xPeerWindow ; } - // protected method - const Reference< XGraphics > BaseControl::impl_getGraphicsPeer() { return m_xGraphicsPeer ; } - // protected method - const sal_Int32& BaseControl::impl_getWidth() { return m_nWidth ; } - // protected method - const sal_Int32& BaseControl::impl_getHeight() { return m_nHeight ; } - // protected method - WindowDescriptor* BaseControl::impl_getWindowDescriptor( const Reference< XWindowPeer >& xParentPeer ) { // - used from "createPeer()" to set the values of an ::com::sun::star::awt::WindowDescriptor !!! @@ -887,10 +769,8 @@ WindowDescriptor* BaseControl::impl_getWindowDescriptor( const Reference< XWindo return pDescriptor ; } - // protected method - void BaseControl::impl_paint( sal_Int32 /*nX*/ , sal_Int32 /*nY*/ , const Reference< XGraphics >& /*xGraphics*/ ) @@ -900,29 +780,23 @@ void BaseControl::impl_paint( sal_Int32 /*nX*/ // - not used in this implementation, but its not necessary to make it pure virtual !!! } - // protected method - void BaseControl::impl_recalcLayout( const WindowEvent& /*aEvent*/ ) { // We need as virtual function to support automaticly resizing of derived controls! // But we make it not pure virtual because it's not necessary for all derived classes! } - // protected method - Reference< XInterface > BaseControl::impl_getDelegator() { return m_xDelegator ; } - // private method - void BaseControl::impl_releasePeer() { if ( m_xPeer.is() ) @@ -946,10 +820,8 @@ void BaseControl::impl_releasePeer() } } - // private method - OMRCListenerMultiplexerHelper* BaseControl::impl_getMultiplexer() { if ( m_pMultiplexer == NULL ) diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx index ccee9bea5a13..54340c2323bc 100644 --- a/UnoControls/source/base/multiplexer.cxx +++ b/UnoControls/source/base/multiplexer.cxx @@ -29,10 +29,8 @@ using namespace ::com::sun::star::lang ; namespace unocontrols{ - // macros - #define MULTIPLEX( INTERFACE, METHOD, EVENTTYP, EVENT ) \ \ /* First get all interfaces from container with right type.*/ \ @@ -63,10 +61,8 @@ namespace unocontrols{ } \ } - // construct/destruct - OMRCListenerMultiplexerHelper::OMRCListenerMultiplexerHelper( const Reference< XWindow >& xControl , const Reference< XWindow >& xPeer ) : m_xPeer ( xPeer ) @@ -92,10 +88,8 @@ OMRCListenerMultiplexerHelper::~OMRCListenerMultiplexerHelper() { } - // XInterface - Any SAL_CALL OMRCListenerMultiplexerHelper::queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) { // Attention: @@ -128,10 +122,8 @@ Any SAL_CALL OMRCListenerMultiplexerHelper::queryInterface( const Type& rType ) } } - // XInterface - void SAL_CALL OMRCListenerMultiplexerHelper::acquire() throw() { // Attention: @@ -141,10 +133,8 @@ void SAL_CALL OMRCListenerMultiplexerHelper::acquire() throw() OWeakObject::acquire(); } - // XInterface - void SAL_CALL OMRCListenerMultiplexerHelper::release() throw() { // Attention: @@ -154,19 +144,15 @@ void SAL_CALL OMRCListenerMultiplexerHelper::release() throw() OWeakObject::release(); } - // operator - OMRCListenerMultiplexerHelper::operator Reference< XInterface >() const { return ((OWeakObject*)this) ; } - // container method - void OMRCListenerMultiplexerHelper::setPeer( const Reference< XWindow >& xPeer ) { MutexGuard aGuard( m_aMutex ); @@ -196,10 +182,8 @@ void OMRCListenerMultiplexerHelper::setPeer( const Reference< XWindow >& xPeer ) } } - // container method - void OMRCListenerMultiplexerHelper::disposeAndClear() { EventObject aEvent ; @@ -207,10 +191,8 @@ void OMRCListenerMultiplexerHelper::disposeAndClear() m_aListenerHolder.disposeAndClear( aEvent ); } - // container method - void OMRCListenerMultiplexerHelper::advise( const Type& aType , const Reference< XInterface >& xListener ) { @@ -225,10 +207,8 @@ void OMRCListenerMultiplexerHelper::advise( const Type& } } - // container method - void OMRCListenerMultiplexerHelper::unadvise( const Type& aType , const Reference< XInterface >& xListener ) { @@ -243,10 +223,8 @@ void OMRCListenerMultiplexerHelper::unadvise( const Type& } } - // XEventListener - void SAL_CALL OMRCListenerMultiplexerHelper::disposing( const EventObject& /*aSource*/ ) throw( RuntimeException, std::exception ) { MutexGuard aGuard( m_aMutex ); @@ -254,208 +232,162 @@ void SAL_CALL OMRCListenerMultiplexerHelper::disposing( const EventObject& /*aSo m_xPeer.clear(); } - // XFcousListener - void OMRCListenerMultiplexerHelper::focusGained(const FocusEvent& aEvent ) throw( RuntimeException, std::exception ) { MULTIPLEX( XFocusListener, focusGained, FocusEvent, aEvent ) } - // XFcousListener - void OMRCListenerMultiplexerHelper::focusLost(const FocusEvent& aEvent ) throw( RuntimeException, std::exception ) { MULTIPLEX( XFocusListener, focusLost, FocusEvent, aEvent ) } - // XWindowListener - void OMRCListenerMultiplexerHelper::windowResized(const WindowEvent& aEvent ) throw( RuntimeException, std::exception ) { MULTIPLEX( XWindowListener, windowResized, WindowEvent, aEvent ) } - // XWindowListener - void OMRCListenerMultiplexerHelper::windowMoved(const WindowEvent& aEvent ) throw( RuntimeException, std::exception ) { MULTIPLEX( XWindowListener, windowMoved, WindowEvent, aEvent ) } - // XWindowListener - void OMRCListenerMultiplexerHelper::windowShown(const EventObject& aEvent ) throw( RuntimeException, std::exception ) { MULTIPLEX( XWindowListener, windowShown, EventObject, aEvent ) } - // XWindowListener - void OMRCListenerMultiplexerHelper::windowHidden(const EventObject& aEvent ) throw( RuntimeException, std::exception ) { MULTIPLEX( XWindowListener, windowHidden, EventObject, aEvent ) } - // XKeyListener - void OMRCListenerMultiplexerHelper::keyPressed(const KeyEvent& aEvent) throw( RuntimeException, std::exception ) { MULTIPLEX( XKeyListener, keyPressed, KeyEvent, aEvent ) } - // XKeyListener - void OMRCListenerMultiplexerHelper::keyReleased(const KeyEvent& aEvent) throw( RuntimeException, std::exception ) { MULTIPLEX( XKeyListener, keyReleased, KeyEvent, aEvent ) } - // XMouseListener - void OMRCListenerMultiplexerHelper::mousePressed(const MouseEvent& aEvent) throw( RuntimeException, std::exception ) { MULTIPLEX( XMouseListener, mousePressed, MouseEvent, aEvent ) } - // XMouseListener - void OMRCListenerMultiplexerHelper::mouseReleased(const MouseEvent& aEvent) throw( RuntimeException, std::exception ) { MULTIPLEX( XMouseListener, mouseReleased, MouseEvent, aEvent ) } - // XMouseListener - void OMRCListenerMultiplexerHelper::mouseEntered(const MouseEvent& aEvent) throw( RuntimeException, std::exception ) { MULTIPLEX( XMouseListener, mouseEntered, MouseEvent, aEvent ) } - // XMouseListener - void OMRCListenerMultiplexerHelper::mouseExited(const MouseEvent& aEvent) throw( RuntimeException, std::exception ) { MULTIPLEX( XMouseListener, mouseExited, MouseEvent, aEvent ) } - // XMouseMotionListener - void OMRCListenerMultiplexerHelper::mouseDragged(const MouseEvent& aEvent) throw( RuntimeException, std::exception ) { MULTIPLEX( XMouseMotionListener, mouseDragged, MouseEvent, aEvent ) } - // XMouseMotionListener - void OMRCListenerMultiplexerHelper::mouseMoved(const MouseEvent& aEvent) throw( RuntimeException, std::exception ) { MULTIPLEX( XMouseMotionListener, mouseMoved, MouseEvent, aEvent ) } - // XPaintListener - void OMRCListenerMultiplexerHelper::windowPaint(const PaintEvent& aEvent) throw( RuntimeException, std::exception ) { MULTIPLEX( XPaintListener, windowPaint, PaintEvent, aEvent ) } - // XTopWindowListener - void OMRCListenerMultiplexerHelper::windowOpened(const EventObject& aEvent) throw( RuntimeException, std::exception ) { MULTIPLEX( XTopWindowListener, windowOpened, EventObject, aEvent ) } - // XTopWindowListener - void OMRCListenerMultiplexerHelper::windowClosing( const EventObject& aEvent ) throw( RuntimeException, std::exception ) { MULTIPLEX( XTopWindowListener, windowClosing, EventObject, aEvent ) } - // XTopWindowListener - void OMRCListenerMultiplexerHelper::windowClosed( const EventObject& aEvent ) throw( RuntimeException, std::exception ) { MULTIPLEX( XTopWindowListener, windowClosed, EventObject, aEvent ) } - // XTopWindowListener - void OMRCListenerMultiplexerHelper::windowMinimized( const EventObject& aEvent ) throw( RuntimeException, std::exception ) { MULTIPLEX( XTopWindowListener, windowMinimized, EventObject, aEvent ) } - // XTopWindowListener - void OMRCListenerMultiplexerHelper::windowNormalized( const EventObject& aEvent ) throw( RuntimeException, std::exception ) { MULTIPLEX( XTopWindowListener, windowNormalized, EventObject, aEvent ) } - // XTopWindowListener - void OMRCListenerMultiplexerHelper::windowActivated( const EventObject& aEvent ) throw( RuntimeException, std::exception ) { MULTIPLEX( XTopWindowListener, windowActivated, EventObject, aEvent ) } - // XTopWindowListener - void OMRCListenerMultiplexerHelper::windowDeactivated( const EventObject& aEvent ) throw( RuntimeException, std::exception ) { MULTIPLEX( XTopWindowListener, windowDeactivated, EventObject, aEvent ) } - // protected method - void OMRCListenerMultiplexerHelper::impl_adviseToPeer( const Reference< XWindow >& xPeer , const Type& aType ) { @@ -484,10 +416,8 @@ void OMRCListenerMultiplexerHelper::impl_adviseToPeer( const Reference< XWind } } - // protected method - void OMRCListenerMultiplexerHelper::impl_unadviseFromPeer( const Reference< XWindow >& xPeer , const Type& aType ) { diff --git a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx index 1266b4028f15..2c578d37a003 100644 --- a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx +++ b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx @@ -21,10 +21,8 @@ #include "OConnectionPointHelper.hxx" - // namespaces - using namespace ::rtl ; using namespace ::osl ; using namespace ::cppu ; @@ -33,10 +31,8 @@ using namespace ::com::sun::star::lang ; namespace unocontrols{ - // construct/destruct - OConnectionPointContainerHelper::OConnectionPointContainerHelper( Mutex& aMutex ) : m_aSharedMutex ( aMutex ) , m_aMultiTypeContainer ( aMutex ) @@ -47,10 +43,8 @@ OConnectionPointContainerHelper::~OConnectionPointContainerHelper() { } - // XInterface - Any SAL_CALL OConnectionPointContainerHelper::queryInterface( const Type& aType ) throw( RuntimeException, std::exception ) { // Attention: @@ -72,10 +66,8 @@ Any SAL_CALL OConnectionPointContainerHelper::queryInterface( const Type& aType return aReturn ; } - // XInterface - void SAL_CALL OConnectionPointContainerHelper::acquire() throw() { // Attention: @@ -85,10 +77,8 @@ void SAL_CALL OConnectionPointContainerHelper::acquire() throw() OWeakObject::acquire(); } - // XInterface - void SAL_CALL OConnectionPointContainerHelper::release() throw() { // Attention: @@ -98,20 +88,16 @@ void SAL_CALL OConnectionPointContainerHelper::release() throw() OWeakObject::release(); } - // XConnectionPointContainer - Sequence< Type > SAL_CALL OConnectionPointContainerHelper::getConnectionPointTypes() throw( RuntimeException, std::exception ) { // Container is threadsafe himself ! return m_aMultiTypeContainer.getContainedTypes(); } - // XConnectionPointContainer - Reference< XConnectionPoint > SAL_CALL OConnectionPointContainerHelper::queryConnectionPoint( const Type& aType ) throw( RuntimeException, std::exception ) { // Set default return value, if method failed. @@ -131,10 +117,8 @@ Reference< XConnectionPoint > SAL_CALL OConnectionPointContainerHelper::queryCon return xConnectionPoint ; } - // XConnectionPointContainer - void SAL_CALL OConnectionPointContainerHelper::advise( const Type& aType , const Reference< XInterface >& xListener ) throw( RuntimeException, std::exception ) { @@ -142,10 +126,8 @@ void SAL_CALL OConnectionPointContainerHelper::advise( const Type& m_aMultiTypeContainer.addInterface( aType, xListener ); } - // XConnectionPointContainer - void SAL_CALL OConnectionPointContainerHelper::unadvise( const Type& aType , const Reference< XInterface >& xListener ) throw( RuntimeException, std::exception ) { @@ -153,11 +135,9 @@ void SAL_CALL OConnectionPointContainerHelper::unadvise( const Type& m_aMultiTypeContainer.removeInterface( aType, xListener ); } - // public but impl method! // Is necessary to get container member at OConnectionPoint-instance. - OMultiTypeInterfaceContainerHelper& OConnectionPointContainerHelper::impl_getMultiTypeContainer() { // Impl methods are not threadsafe! diff --git a/UnoControls/source/controls/OConnectionPointHelper.cxx b/UnoControls/source/controls/OConnectionPointHelper.cxx index 25036efd3c36..c776439c18bc 100644 --- a/UnoControls/source/controls/OConnectionPointHelper.cxx +++ b/UnoControls/source/controls/OConnectionPointHelper.cxx @@ -21,10 +21,8 @@ #include "OConnectionPointContainerHelper.hxx" - // namespaces - using namespace ::rtl ; using namespace ::osl ; using namespace ::cppu ; @@ -33,10 +31,8 @@ using namespace ::com::sun::star::lang ; namespace unocontrols{ - // construct/destruct - OConnectionPointHelper::OConnectionPointHelper( Mutex& aMutex , OConnectionPointContainerHelper* pContainerImplementation , @@ -52,10 +48,8 @@ OConnectionPointHelper::~OConnectionPointHelper() { } - // XInterface - Any SAL_CALL OConnectionPointHelper::queryInterface( const Type& aType ) throw( RuntimeException, std::exception ) { // Attention: @@ -77,10 +71,8 @@ Any SAL_CALL OConnectionPointHelper::queryInterface( const Type& aType ) throw( return aReturn ; } - // XInterface - void SAL_CALL OConnectionPointHelper::acquire() throw() { // Attention: @@ -90,10 +82,8 @@ void SAL_CALL OConnectionPointHelper::acquire() throw() OWeakObject::acquire(); } - // XInterface - void SAL_CALL OConnectionPointHelper::release() throw() { // Attention: @@ -103,10 +93,8 @@ void SAL_CALL OConnectionPointHelper::release() throw() OWeakObject::release(); } - // XConnectionPoint - Type SAL_CALL OConnectionPointHelper::getConnectionType() throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -127,10 +115,8 @@ Type SAL_CALL OConnectionPointHelper::getConnectionType() throw( RuntimeExceptio return aReturnType; } - // XConnectionPoint - Reference< XConnectionPointContainer > SAL_CALL OConnectionPointHelper::getConnectionPointContainer() throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -139,10 +125,8 @@ Reference< XConnectionPointContainer > SAL_CALL OConnectionPointHelper::getConne return Reference< XConnectionPointContainer >( m_oContainerWeakReference.get(), UNO_QUERY ); } - // XConnectionPoint - void SAL_CALL OConnectionPointHelper::advise( const Reference< XInterface >& xListener ) throw( ListenerExistException , InvalidListenerException , RuntimeException, std::exception ) @@ -174,10 +158,8 @@ void SAL_CALL OConnectionPointHelper::advise( const Reference< XInterface >& xLi impl_UnlockContainer(); } - // XConnectionPoint - void SAL_CALL OConnectionPointHelper::unadvise( const Reference< XInterface >& xListener ) throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -195,10 +177,8 @@ void SAL_CALL OConnectionPointHelper::unadvise( const Reference< XInterface >& x impl_UnlockContainer(); } - // XConnectionPoint - Sequence< Reference< XInterface > > SAL_CALL OConnectionPointHelper::getConnections() throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -226,10 +206,8 @@ Sequence< Reference< XInterface > > SAL_CALL OConnectionPointHelper::getConnecti return seqReturnConnections; } - // private method - bool OConnectionPointHelper::impl_LockContainer() { // Convert weakreference to hard uno3-reference and return state. @@ -239,10 +217,8 @@ bool OConnectionPointHelper::impl_LockContainer() return m_xLock.is(); } - // private method - void OConnectionPointHelper::impl_UnlockContainer() { // Free hard uno3-reference to container. diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx index 553571c17a6b..f6d94ef83515 100644 --- a/UnoControls/source/controls/framecontrol.cxx +++ b/UnoControls/source/controls/framecontrol.cxx @@ -30,10 +30,8 @@ #include <cppuhelper/typeprovider.hxx> #include <osl/diagnose.h> - // namespaces - using namespace ::rtl ; using namespace ::osl ; using namespace ::cppu ; @@ -46,10 +44,8 @@ using namespace ::com::sun::star::util ; namespace unocontrols{ - // construct/destruct - FrameControl::FrameControl( const Reference< XComponentContext >& rxContext) : BaseControl ( rxContext ) , OBroadcastHelper ( m_aMutex ) @@ -63,10 +59,8 @@ FrameControl::~FrameControl() { } - // XInterface - Any SAL_CALL FrameControl::queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) { // Attention: @@ -88,10 +82,8 @@ Any SAL_CALL FrameControl::queryInterface( const Type& rType ) throw( RuntimeExc return aReturn ; } - // XInterface - void SAL_CALL FrameControl::acquire() throw() { // Attention: @@ -101,10 +93,8 @@ void SAL_CALL FrameControl::acquire() throw() BaseControl::acquire(); } - // XInterface - void SAL_CALL FrameControl::release() throw() { // Attention: @@ -114,10 +104,8 @@ void SAL_CALL FrameControl::release() throw() BaseControl::release(); } - // XTypeProvider - Sequence< Type > SAL_CALL FrameControl::getTypes() throw( RuntimeException, std::exception ) { // Optimize this method ! @@ -147,10 +135,8 @@ Sequence< Type > SAL_CALL FrameControl::getTypes() throw( RuntimeException, std: return pTypeCollection->getTypes(); } - // XAggregation - Any SAL_CALL FrameControl::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception ) { // Ask for my own supported interfaces ... @@ -175,10 +161,8 @@ Any SAL_CALL FrameControl::queryAggregation( const Type& aType ) throw( RuntimeE return aReturn ; } - // XControl - void SAL_CALL FrameControl::createPeer( const Reference< XToolkit >& xToolkit , const Reference< XWindowPeer >& xParentPeer ) throw( RuntimeException, std::exception ) { @@ -192,80 +176,64 @@ void SAL_CALL FrameControl::createPeer( const Reference< XToolkit >& xToo } } - // XControl - sal_Bool SAL_CALL FrameControl::setModel( const Reference< XControlModel >& /*xModel*/ ) throw( RuntimeException, std::exception ) { // We have no model. return sal_False ; } - // XControl - Reference< XControlModel > SAL_CALL FrameControl::getModel() throw( RuntimeException, std::exception ) { // We have no model. return Reference< XControlModel >(); } - // XControl - void SAL_CALL FrameControl::dispose() throw( RuntimeException, std::exception ) { impl_deleteFrame(); BaseControl::dispose(); } - // XView - sal_Bool SAL_CALL FrameControl::setGraphics( const Reference< XGraphics >& /*xDevice*/ ) throw( RuntimeException, std::exception ) { // it is not possible to print this control return sal_False ; } - // XView - Reference< XGraphics > SAL_CALL FrameControl::getGraphics() throw( RuntimeException, std::exception ) { // when its not posible to set graphics ! then its possible to return null return Reference< XGraphics >(); } - // XConnectionPointContainer - Sequence< Type > SAL_CALL FrameControl::getConnectionPointTypes() throw( RuntimeException, std::exception ) { // Forwarded to helper class return m_aConnectionPointContainer.getConnectionPointTypes(); } - // XConnectionPointContainer - Reference< XConnectionPoint > SAL_CALL FrameControl::queryConnectionPoint( const Type& aType ) throw( RuntimeException, std::exception ) { // Forwarded to helper class return m_aConnectionPointContainer.queryConnectionPoint( aType ); } - // XConnectionPointContainer - void SAL_CALL FrameControl::advise( const Type& aType , const Reference< XInterface >& xListener ) throw( RuntimeException, std::exception ) { @@ -273,10 +241,8 @@ void SAL_CALL FrameControl::advise( const Type& aType m_aConnectionPointContainer.advise( aType, xListener ); } - // XConnectionPointContainer - void SAL_CALL FrameControl::unadvise( const Type& aType , const Reference< XInterface >& xListener ) throw( RuntimeException, std::exception ) { @@ -284,10 +250,8 @@ void SAL_CALL FrameControl::unadvise( const Type& aTyp m_aConnectionPointContainer.unadvise( aType, xListener ); } - // impl but public method to register service - const Sequence< OUString > FrameControl::impl_getStaticSupportedServiceNames() { MutexGuard aGuard( Mutex::getGlobalMutex() ); @@ -296,19 +260,15 @@ const Sequence< OUString > FrameControl::impl_getStaticSupportedServiceNames() return seqServiceNames ; } - // impl but public method to register service - const OUString FrameControl::impl_getStaticImplementationName() { return OUString(IMPLEMENTATIONNAME_FRAMECONTROL); } - // OPropertySetHelper - sal_Bool FrameControl::convertFastPropertyValue( Any& rConvertedValue , Any& rOldValue , sal_Int32 nHandle , @@ -336,10 +296,8 @@ sal_Bool FrameControl::convertFastPropertyValue( Any& rConvertedVa return bReturn ; } - // OPropertySetHelper - void FrameControl::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , const Any& rValue ) throw ( ::com::sun::star::uno::Exception, std::exception ) @@ -362,10 +320,8 @@ void FrameControl::setFastPropertyValue_NoBroadcast( sal_Int32 nHan } } - // OPropertySetHelper - void FrameControl::getFastPropertyValue( Any& rRet , sal_Int32 nHandle ) const { @@ -386,10 +342,8 @@ void FrameControl::getFastPropertyValue( Any& rRet , } } - // OPropertySetHelper - IPropertyArrayHelper& FrameControl::getInfoHelper() { // Create a table that map names to index values. @@ -409,10 +363,8 @@ IPropertyArrayHelper& FrameControl::getInfoHelper() return *pInfo ; } - // OPropertySetHelper - Reference< XPropertySetInfo > SAL_CALL FrameControl::getPropertySetInfo() throw( RuntimeException, std::exception ) { // Optimize this method ! @@ -435,10 +387,8 @@ Reference< XPropertySetInfo > SAL_CALL FrameControl::getPropertySetInfo() throw( return ( *pInfo ) ; } - // BaseControl - WindowDescriptor* FrameControl::impl_getWindowDescriptor( const Reference< XWindowPeer >& xParentPeer ) { WindowDescriptor* pDescriptor = new WindowDescriptor ; @@ -452,10 +402,8 @@ WindowDescriptor* FrameControl::impl_getWindowDescriptor( const Reference< XWind return pDescriptor ; } - // private method - void FrameControl::impl_createFrame( const Reference< XWindowPeer >& xPeer , const OUString& rURL , const Sequence< PropertyValue >& rArguments ) @@ -468,8 +416,6 @@ void FrameControl::impl_createFrame( const Reference< XWindowPeer >& xPee xOldFrame = m_xFrame ; } - - xNewFrame = Frame::create( impl_getComponentContext() ); Reference< XWindow > xWP ( xPeer, UNO_QUERY ) ; @@ -509,10 +455,8 @@ void FrameControl::impl_createFrame( const Reference< XWindowPeer >& xPee } } - // private method - void FrameControl::impl_deleteFrame() { Reference< XFrame2 > xOldFrame; @@ -536,10 +480,8 @@ void FrameControl::impl_deleteFrame() xOldFrame->dispose(); } - // private method - const Sequence< Property > FrameControl::impl_getStaticPropertyDescriptor() { // All Properties of this implementation. The array must be sorted! diff --git a/UnoControls/source/controls/progressbar.cxx b/UnoControls/source/controls/progressbar.cxx index 654609156e66..33eedda5a3f1 100644 --- a/UnoControls/source/controls/progressbar.cxx +++ b/UnoControls/source/controls/progressbar.cxx @@ -38,10 +38,8 @@ using namespace ::com::sun::star::awt ; namespace unocontrols{ - // construct/destruct - ProgressBar::ProgressBar( const Reference< XComponentContext >& rxContext ) : BaseControl ( rxContext ) , m_bHorizontal ( PROGRESSBAR_DEFAULT_HORIZONTAL ) @@ -59,10 +57,8 @@ ProgressBar::~ProgressBar() { } - // XInterface - Any SAL_CALL ProgressBar::queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) { // Attention: @@ -84,10 +80,8 @@ Any SAL_CALL ProgressBar::queryInterface( const Type& rType ) throw( RuntimeExce return aReturn ; } - // XInterface - void SAL_CALL ProgressBar::acquire() throw() { // Attention: @@ -97,10 +91,8 @@ void SAL_CALL ProgressBar::acquire() throw() BaseControl::acquire(); } - // XInterface - void SAL_CALL ProgressBar::release() throw() { // Attention: @@ -110,10 +102,8 @@ void SAL_CALL ProgressBar::release() throw() BaseControl::release(); } - // XTypeProvider - Sequence< Type > SAL_CALL ProgressBar::getTypes() throw( RuntimeException, std::exception ) { // Optimize this method ! @@ -142,10 +132,8 @@ Sequence< Type > SAL_CALL ProgressBar::getTypes() throw( RuntimeException, std:: return pTypeCollection->getTypes(); } - // XAggregation - Any SAL_CALL ProgressBar::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception ) { // Ask for my own supported interfaces ... @@ -166,10 +154,8 @@ Any SAL_CALL ProgressBar::queryAggregation( const Type& aType ) throw( RuntimeEx return aReturn ; } - // XProgressBar - void SAL_CALL ProgressBar::setForegroundColor( sal_Int32 nColor ) throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -182,10 +168,8 @@ void SAL_CALL ProgressBar::setForegroundColor( sal_Int32 nColor ) throw( Runtime impl_paint ( 0, 0, impl_getGraphicsPeer() ) ; } - // XProgressBar - void SAL_CALL ProgressBar::setBackgroundColor ( sal_Int32 nColor ) throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -198,10 +182,8 @@ void SAL_CALL ProgressBar::setBackgroundColor ( sal_Int32 nColor ) throw( Runtim impl_paint ( 0, 0, impl_getGraphicsPeer() ) ; } - // XProgressBar - void SAL_CALL ProgressBar::setValue ( sal_Int32 nValue ) throw( RuntimeException, std::exception ) { // This method is defined for follow things: @@ -229,10 +211,8 @@ void SAL_CALL ProgressBar::setValue ( sal_Int32 nValue ) throw( RuntimeException } } - // XProgressBar - void SAL_CALL ProgressBar::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( RuntimeException, std::exception ) { // This method is defined for follow things: @@ -273,10 +253,8 @@ void SAL_CALL ProgressBar::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( Ru // Next call of "ProgressBar::setValue()" do this. } - // XProgressBar - sal_Int32 SAL_CALL ProgressBar::getValue () throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -285,10 +263,8 @@ sal_Int32 SAL_CALL ProgressBar::getValue () throw( RuntimeException, std::except return ( m_nValue ) ; } - // XWindow - void SAL_CALL ProgressBar::setPosSize ( sal_Int32 nX, sal_Int32 nY, @@ -313,48 +289,38 @@ void SAL_CALL ProgressBar::setPosSize ( } } - // XControl - sal_Bool SAL_CALL ProgressBar::setModel( const Reference< XControlModel >& /*xModel*/ ) throw( RuntimeException, std::exception ) { // A model is not possible for this control. return sal_False ; } - // XControl - Reference< XControlModel > SAL_CALL ProgressBar::getModel() throw( RuntimeException, std::exception ) { // A model is not possible for this control. return Reference< XControlModel >(); } - // impl but public method to register service - const Sequence< OUString > ProgressBar::impl_getStaticSupportedServiceNames() { return css::uno::Sequence<OUString>(); } - // impl but public method to register service - const OUString ProgressBar::impl_getStaticImplementationName() { return OUString("stardiv.UnoControls.ProgressBar"); } - // protected method - void ProgressBar::impl_paint ( sal_Int32 nX, sal_Int32 nY, const Reference< XGraphics > & rGraphics ) { // save impossible cases @@ -426,10 +392,8 @@ void ProgressBar::impl_paint ( sal_Int32 nX, sal_Int32 nY, const Reference< XGra } } - // protected method - void ProgressBar::impl_recalcRange () { MutexGuard aGuard (m_aMutex) ; diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx index e90b21a67bb9..b0f4c5b1eb1b 100644 --- a/UnoControls/source/controls/statusindicator.cxx +++ b/UnoControls/source/controls/statusindicator.cxx @@ -36,10 +36,8 @@ using namespace ::com::sun::star::task ; namespace unocontrols{ - // construct/destruct - StatusIndicator::StatusIndicator( const css::uno::Reference< XComponentContext >& rxContext ) : BaseContainerControl ( rxContext ) { @@ -69,10 +67,8 @@ StatusIndicator::StatusIndicator( const css::uno::Reference< XComponentContext > StatusIndicator::~StatusIndicator() {} - // XInterface - Any SAL_CALL StatusIndicator::queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) { // Attention: @@ -94,10 +90,8 @@ Any SAL_CALL StatusIndicator::queryInterface( const Type& rType ) throw( Runtime return aReturn ; } - // XInterface - void SAL_CALL StatusIndicator::acquire() throw() { // Attention: @@ -107,10 +101,8 @@ void SAL_CALL StatusIndicator::acquire() throw() BaseControl::acquire(); } - // XInterface - void SAL_CALL StatusIndicator::release() throw() { // Attention: @@ -120,10 +112,8 @@ void SAL_CALL StatusIndicator::release() throw() BaseControl::release(); } - // XTypeProvider - Sequence< Type > SAL_CALL StatusIndicator::getTypes() throw( RuntimeException, std::exception ) { // Optimize this method ! @@ -152,10 +142,8 @@ Sequence< Type > SAL_CALL StatusIndicator::getTypes() throw( RuntimeException, s return pTypeCollection->getTypes(); } - // XAggregation - Any SAL_CALL StatusIndicator::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception ) { // Ask for my own supported interfaces ... @@ -176,10 +164,8 @@ Any SAL_CALL StatusIndicator::queryAggregation( const Type& aType ) throw( Runti return aReturn ; } - // XStatusIndicator - void SAL_CALL StatusIndicator::start( const OUString& sText, sal_Int32 nRange ) throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -192,10 +178,8 @@ void SAL_CALL StatusIndicator::start( const OUString& sText, sal_Int32 nRange ) impl_recalcLayout ( WindowEvent(static_cast< OWeakObject* >(this),0,0,impl_getWidth(),impl_getHeight(),0,0,0,0) ) ; } - // XStatusIndicator - void SAL_CALL StatusIndicator::end() throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -207,10 +191,8 @@ void SAL_CALL StatusIndicator::end() throw( RuntimeException, std::exception ) setVisible( sal_False ); } - // XStatusIndicator - void SAL_CALL StatusIndicator::setText( const OUString& sText ) throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -220,10 +202,8 @@ void SAL_CALL StatusIndicator::setText( const OUString& sText ) throw( RuntimeEx m_xText->setText( sText ); } - // XStatusIndicator - void SAL_CALL StatusIndicator::setValue( sal_Int32 nValue ) throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -233,10 +213,8 @@ void SAL_CALL StatusIndicator::setValue( sal_Int32 nValue ) throw( RuntimeExcept m_xProgressBar->setValue( nValue ); } - // XStatusIndicator - void SAL_CALL StatusIndicator::reset() throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -248,19 +226,15 @@ void SAL_CALL StatusIndicator::reset() throw( RuntimeException, std::exception ) m_xProgressBar->setValue( 0 ); } - // XLayoutConstrains - Size SAL_CALL StatusIndicator::getMinimumSize () throw( RuntimeException, std::exception ) { return Size (STATUSINDICATOR_DEFAULT_WIDTH, STATUSINDICATOR_DEFAULT_HEIGHT) ; } - // XLayoutConstrains - Size SAL_CALL StatusIndicator::getPreferredSize () throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -290,19 +264,15 @@ Size SAL_CALL StatusIndicator::getPreferredSize () throw( RuntimeException, std: return Size ( nWidth, nHeight ) ; } - // XLayoutConstrains - Size SAL_CALL StatusIndicator::calcAdjustedSize ( const Size& /*rNewSize*/ ) throw( RuntimeException, std::exception ) { return getPreferredSize () ; } - // XControl - void SAL_CALL StatusIndicator::createPeer ( const css::uno::Reference< XToolkit > & rToolkit, const css::uno::Reference< XWindowPeer > & rParent @@ -320,20 +290,16 @@ void SAL_CALL StatusIndicator::createPeer ( } } - // XControl - sal_Bool SAL_CALL StatusIndicator::setModel ( const css::uno::Reference< XControlModel > & /*rModel*/ ) throw( RuntimeException, std::exception ) { // We have no model. return sal_False ; } - // XControl - css::uno::Reference< XControlModel > SAL_CALL StatusIndicator::getModel () throw( RuntimeException, std::exception ) { // We have no model. @@ -341,10 +307,8 @@ css::uno::Reference< XControlModel > SAL_CALL StatusIndicator::getModel () throw return css::uno::Reference< XControlModel > () ; } - // XComponent - void SAL_CALL StatusIndicator::dispose () throw( RuntimeException, std::exception ) { // Ready for multithreading @@ -363,10 +327,8 @@ void SAL_CALL StatusIndicator::dispose () throw( RuntimeException, std::exceptio BaseContainerControl::dispose(); } - // XWindow - void SAL_CALL StatusIndicator::setPosSize ( sal_Int32 nX, sal_Int32 nY, @@ -394,28 +356,22 @@ void SAL_CALL StatusIndicator::setPosSize ( } } - // impl but public method to register service - const Sequence< OUString > StatusIndicator::impl_getStaticSupportedServiceNames() { return css::uno::Sequence<OUString>(); } - // impl but public method to register service - const OUString StatusIndicator::impl_getStaticImplementationName() { return OUString("stardiv.UnoControls.StatusIndicator"); } - // protected method - WindowDescriptor* StatusIndicator::impl_getWindowDescriptor( const css::uno::Reference< XWindowPeer >& xParentPeer ) { // - used from "createPeer()" to set the values of an ::com::sun::star::awt::WindowDescriptor !!! @@ -433,10 +389,8 @@ WindowDescriptor* StatusIndicator::impl_getWindowDescriptor( const css::uno::Ref return pDescriptor ; } - // protected method - void StatusIndicator::impl_paint ( sal_Int32 nX, sal_Int32 nY, const css::uno::Reference< XGraphics > & rGraphics ) { // This paint method ist not buffered !! @@ -472,10 +426,8 @@ void StatusIndicator::impl_paint ( sal_Int32 nX, sal_Int32 nY, const css::uno::R } } - // protected method - void StatusIndicator::impl_recalcLayout ( const WindowEvent& aEvent ) { sal_Int32 nX_ProgressBar ; diff --git a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx index 2a82e66b808c..162b762f2a47 100644 --- a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx +++ b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx @@ -25,30 +25,22 @@ #include <cppuhelper/weak.hxx> #include <cppuhelper/propshlp.hxx> - // namespaces - namespace unocontrols{ - // class declaration OConnectionPointContainerHelper - class OConnectionPointContainerHelper : public ::com::sun::star::lang::XConnectionPointContainer , public ::cppu::OWeakObject { - // public methods - public: - // construct/destruct - /**_________________________________________________________________________________________________________ @short @descr @@ -79,10 +71,8 @@ public: virtual ~OConnectionPointContainerHelper(); - // XInterface - /**_______________________________________________________________________________________________________ @short give answer, if interface is supported @descr The interfaces are searched by type. @@ -131,10 +121,8 @@ public: virtual void SAL_CALL release() throw() SAL_OVERRIDE; - // XConnectionPointContainer - /**_________________________________________________________________________________________________________ @short @descr @@ -219,10 +207,8 @@ public: ::cppu::OMultiTypeInterfaceContainerHelper& impl_getMultiTypeContainer(); - // private variables - private: ::osl::Mutex& m_aSharedMutex ; diff --git a/UnoControls/source/inc/OConnectionPointHelper.hxx b/UnoControls/source/inc/OConnectionPointHelper.hxx index 4354f031a213..f7d8d8e3d4c0 100644 --- a/UnoControls/source/inc/OConnectionPointHelper.hxx +++ b/UnoControls/source/inc/OConnectionPointHelper.hxx @@ -27,30 +27,22 @@ #include "OConnectionPointContainerHelper.hxx" - // namespaces - namespace unocontrols{ - // class declaration OConnectionPointHelper - class OConnectionPointHelper : public ::com::sun::star::lang::XConnectionPoint , public ::cppu::OWeakObject { - // public methods - public: - // construct/destruct - /**_________________________________________________________________________________________________________ @short @descr @@ -83,10 +75,8 @@ public: virtual ~OConnectionPointHelper(); - // XInterface - /**_______________________________________________________________________________________________________ @short give answer, if interface is supported @descr The interfaces are searched by type. @@ -135,10 +125,8 @@ public: virtual void SAL_CALL release() throw() SAL_OVERRIDE; - // XConnectionPoint - /**_________________________________________________________________________________________________________ @short @descr @@ -224,10 +212,8 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > SAL_CALL getConnections() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // private methods - private: /**_________________________________________________________________________________________________________ @@ -260,10 +246,8 @@ private: void impl_UnlockContainer(); - // private variables - private: ::osl::Mutex& m_aSharedMutex ; diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx index e6b7197c8798..c0365e253c32 100644 --- a/UnoControls/source/inc/framecontrol.hxx +++ b/UnoControls/source/inc/framecontrol.hxx @@ -33,10 +33,8 @@ #include "basecontrol.hxx" #include "OConnectionPointContainerHelper.hxx" - // namespaces - namespace unocontrols{ #define SERVICENAME_FRAMECONTROL "com.sun.star.frame.FrameControl" @@ -50,10 +48,8 @@ namespace unocontrols{ #define PROPERTYHANDLE_FRAME 1 #define PROPERTYHANDLE_LOADERARGUMENTS 2 - // class - class FrameControl : public ::com::sun::star::awt::XControlModel , public ::com::sun::star::lang::XConnectionPointContainer , public BaseControl // This order is necessary for right initialization of m_aMutex! @@ -61,24 +57,18 @@ class FrameControl : public ::com::sun::star::awt::XControlModel , public ::cppu::OPropertySetHelper { - // public methods - public: - // construct/destruct - FrameControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); virtual ~FrameControl(); - // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -115,25 +105,19 @@ public: virtual void SAL_CALL release() throw() SAL_OVERRIDE; - // XTypeProvider - 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 - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XControl - virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& xToolkit , const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent @@ -146,16 +130,12 @@ 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 - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XView - virtual sal_Bool SAL_CALL setGraphics( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xDevice ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -163,10 +143,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > SAL_CALL getGraphics() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XConnectionPointContainer - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getConnectionPointTypes() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -184,24 +162,19 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // impl but public methods to register service! - static const ::com::sun::star::uno::Sequence< OUString > impl_getStaticSupportedServiceNames(); static const OUString impl_getStaticImplementationName(); - // protected methods - protected: using OPropertySetHelper::getFastPropertyValue; // OPropertySetHelper - virtual sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any& rConvertedValue , ::com::sun::star::uno::Any& rOldValue , @@ -219,25 +192,19 @@ protected: virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; - // XPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // BaseControl - virtual ::com::sun::star::awt::WindowDescriptor* impl_getWindowDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParentPeer ) SAL_OVERRIDE; - // private methods - private: void impl_createFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xPeer , @@ -248,11 +215,8 @@ private: static const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); - - // private variables - private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame2 > m_xFrame ; diff --git a/UnoControls/source/inc/progressbar.hxx b/UnoControls/source/inc/progressbar.hxx index b434a8be6baa..8e2442c70631 100644 --- a/UnoControls/source/inc/progressbar.hxx +++ b/UnoControls/source/inc/progressbar.hxx @@ -25,10 +25,8 @@ #include "basecontrol.hxx" - // namespaces - namespace unocontrols{ #define PROGRESSBAR_FREESPACE 4 @@ -48,16 +46,12 @@ class ProgressBar : public ::com::sun::star::awt::XControlModel , public BaseControl { - // public methods - public: - // construct/destruct - /**_________________________________________________________________________________________________________ @short @descr @@ -88,10 +82,8 @@ public: virtual ~ProgressBar(); - // XInterface - /**_________________________________________________________________________________________________________ @short @descr @@ -140,10 +132,8 @@ public: virtual void SAL_CALL release() throw() SAL_OVERRIDE; - // XTypeProvider - /**_________________________________________________________________________________________________________ @short @descr @@ -160,10 +150,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 @@ -180,10 +168,8 @@ public: ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XProgressBar - /**_________________________________________________________________________________________________________ @short @descr @@ -264,10 +250,8 @@ public: virtual sal_Int32 SAL_CALL getValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XWindow - /**_________________________________________________________________________________________________________ @short @descr @@ -289,10 +273,8 @@ public: sal_Int16 nFlags ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XControl - /**_________________________________________________________________________________________________________ @short @descr @@ -326,10 +308,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; - // BaseControl - /**_________________________________________________________________________________________________________ @short @descr @@ -360,10 +340,8 @@ public: static const OUString impl_getStaticImplementationName(); - // protected methods - protected: /**_________________________________________________________________________________________________________ @@ -400,10 +378,8 @@ protected: void impl_recalcRange(); - // private variables - private: bool m_bHorizontal ; // orientation for steps [true=horizontal/false=vertikal] diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx index 88c03d486796..4be5966f0ba7 100644 --- a/UnoControls/source/inc/progressmonitor.hxx +++ b/UnoControls/source/inc/progressmonitor.hxx @@ -84,10 +84,8 @@ class ProgressBar; #define PROGRESSMONITOR_DEFAULT_WIDTH 350 #define PROGRESSMONITOR_DEFAULT_HEIGHT 100 - // structs, types - /// Item of TextList struct IMPL_TextlistItem { @@ -95,26 +93,20 @@ struct IMPL_TextlistItem OUString sText ; /// Right site of textline in dialog }; - // class declaration - class ProgressMonitor : public ::com::sun::star::awt::XLayoutConstrains , public ::com::sun::star::awt::XButton , public ::com::sun::star::awt::XProgressMonitor , public BaseContainerControl { - // public methods - public: - // construct/destruct - /**_______________________________________________________________________________________________________ @short @descr @@ -145,10 +137,8 @@ public: virtual ~ProgressMonitor(); - // XInterface - /**_______________________________________________________________________________________________________ @short give answer, if interface is supported @descr The interfaces are searched by type. @@ -197,10 +187,8 @@ public: virtual void SAL_CALL release() throw() SAL_OVERRIDE; - // XTypeProvider - /**_______________________________________________________________________________________________________ @short get information about supported interfaces @descr - @@ -216,10 +204,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 - @@ -236,10 +222,8 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XProgressMonitor - /**_______________________________________________________________________________________________________ @short add topic to dialog @descr Add a topic with a text in right textlist (used for FixedText-member).<BR> @@ -303,10 +287,8 @@ public: sal_Bool bbeforeProgress ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XProgressBar - /**_______________________________________________________________________________________________________ @short - @descr - @@ -383,10 +365,8 @@ public: virtual sal_Int32 SAL_CALL getValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XButton - /**_______________________________________________________________________________________________________ @short - @descr - @@ -452,10 +432,8 @@ public: virtual void SAL_CALL setActionCommand( const OUString& sCommand ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XLayoutConstrains - /**_______________________________________________________________________________________________________ @short - @descr - @@ -502,10 +480,8 @@ public: virtual ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XControl - /**_______________________________________________________________________________________________________ @short - @descr - @@ -556,10 +532,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 - @@ -575,10 +549,8 @@ public: virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XWindow - /**_______________________________________________________________________________________________________ @short - @descr - @@ -598,10 +570,8 @@ public: sal_Int32 nHeight , sal_Int16 nFlags ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // BaseControl - /**_______________________________________________________________________________________________________ @short - @descr - @@ -632,10 +602,8 @@ public: static const OUString impl_getStaticImplementationName(); - // protected methods - protected: /**_______________________________________________________________________________________________________ @@ -655,10 +623,8 @@ protected: sal_Int32 nY , const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics ) SAL_OVERRIDE; - // private methods - private: using BaseControl::impl_recalcLayout; /**_______________________________________________________________________________________________________ @@ -721,10 +687,8 @@ private: IMPL_TextlistItem* impl_searchTopic( const OUString& sTopic , bool bbeforeProgress ); - // debug methods - private: /**_______________________________________________________________________________________________________ @@ -749,7 +713,6 @@ private: // private variables - private: ::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") diff --git a/UnoControls/source/inc/statusindicator.hxx b/UnoControls/source/inc/statusindicator.hxx index 5558a15aa3be..bb49eca61114 100644 --- a/UnoControls/source/inc/statusindicator.hxx +++ b/UnoControls/source/inc/statusindicator.hxx @@ -49,29 +49,21 @@ class ProgressBar; #define STATUSINDICATOR_DEFAULT_WIDTH 300 #define STATUSINDICATOR_DEFAULT_HEIGHT 25 - // structs, types - - // class declaration - class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains , public ::com::sun::star::task::XStatusIndicator , public BaseContainerControl { - // public methods - public: - // construct/destruct - /**_______________________________________________________________________________________________________ @short @descr @@ -102,10 +94,8 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains virtual ~StatusIndicator(); - // XInterface - /**_______________________________________________________________________________________________________ @short give answer, if interface is supported @descr The interfaces are searched by type. @@ -154,10 +144,8 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains virtual void SAL_CALL release() throw() SAL_OVERRIDE; - // XTypeProvider - /**_______________________________________________________________________________________________________ @short get information about supported interfaces @descr - @@ -174,10 +162,8 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains 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 - @@ -194,10 +180,8 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XStatusIndicator - /*-**************************************************************************************************** @short - @descr - @@ -276,10 +260,8 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XLayoutConstrains - /**_______________________________________________________________________________________________________ @short - @descr - @@ -326,10 +308,8 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains virtual ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XControl - /**_______________________________________________________________________________________________________ @short - @descr - @@ -380,10 +360,8 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains 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 - @@ -399,10 +377,8 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XWindow - /**_______________________________________________________________________________________________________ @short - @descr - @@ -422,10 +398,8 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains sal_Int32 nHeight , sal_Int16 nFlags ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // BaseControl - /**_______________________________________________________________________________________________________ @short - @descr - @@ -456,10 +430,8 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains static const OUString impl_getStaticImplementationName(); - // protected methods - protected: /**_______________________________________________________________________________________________________ @@ -513,10 +485,8 @@ protected: virtual void impl_recalcLayout( const ::com::sun::star::awt::WindowEvent& aEvent ) SAL_OVERRIDE; - // debug methods - private: /**_______________________________________________________________________________________________________ @@ -532,10 +502,8 @@ private: @onerror - */ - // private variables - private: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText > m_xText ; |