diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-04-07 17:26:06 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-04-07 17:27:39 +0200 |
commit | 6ac0e1399a2be344284f192fb3445489346b1fba (patch) | |
tree | c79887c9a1ddf69718f231b1797dc03d06c4fc84 /include | |
parent | Fix thinko (diff) | |
download | core-6ac0e1399a2be344284f192fb3445489346b1fba.tar.gz core-6ac0e1399a2be344284f192fb3445489346b1fba.zip |
Remove silly PUT_SEMICOLON_AT_THE_END
...and rather live with macro calls not terminated by semicolons until those
macros are gone for good anyway. Completely remove unused
DECLARE_UNO3_XCOMPONENT_DEFAULTS.
Change-Id: I0d4eb5a91736004b0da2b09fce860e57f6d1ddbd
Diffstat (limited to 'include')
-rw-r--r-- | include/comphelper/uno3.hxx | 53 | ||||
-rw-r--r-- | include/svtools/genericunodialog.hxx | 2 | ||||
-rw-r--r-- | include/svx/fmdpage.hxx | 2 | ||||
-rw-r--r-- | include/svx/fmgridif.hxx | 14 | ||||
-rw-r--r-- | include/svx/fmsrcimp.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/controls/tkthrobber.hxx | 2 |
6 files changed, 14 insertions, 61 deletions
diff --git a/include/comphelper/uno3.hxx b/include/comphelper/uno3.hxx index 0bebb9fa91aa..e853590088a1 100644 --- a/include/comphelper/uno3.hxx +++ b/include/comphelper/uno3.hxx @@ -44,8 +44,7 @@ namespace comphelper */ #define DECLARE_UNO3_DEFAULTS(classname, baseclass) \ virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { baseclass::acquire(); } \ - virtual void SAL_CALL release() throw() SAL_OVERRIDE { baseclass::release(); } \ - void SAL_CALL PUT_SEMICOLON_AT_THE_END() + virtual void SAL_CALL release() throw() SAL_OVERRIDE { baseclass::release(); } /** used for declaring UNO3-Defaults, i.e. acquire/release if you want to forward all queryInterfaces to the base class, (e.g. if you overload queryAggregation) @@ -54,50 +53,7 @@ namespace comphelper virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { baseclass::acquire(); } \ virtual void SAL_CALL release() throw() SAL_OVERRIDE { baseclass::release(); } \ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ - { return baseclass::queryInterface(_rType); } \ - void SAL_CALL PUT_SEMICOLON_AT_THE_END() - - /** Use this macro to forward XComponent methods to base class - - When using the ::cppu::WeakComponentImplHelper base classes to - implement a UNO interface, a problem occurs when the interface - itself already derives from XComponent (like e.g. awt::XWindow - or awt::XControl): ::cppu::WeakComponentImplHelper is then - still abstract. Using this macro in the most derived class - definition provides overrides for the XComponent methods, - forwarding them to the given baseclass. - - @param classname - Name of the class this macro is issued within - - @param baseclass - Name of the baseclass that should have the XInterface methods - forwarded to - that's usually the WeakComponentImplHelperN base - - @param implhelper - Name of the baseclass that should have the XComponent methods - forwarded to - in the case of the WeakComponentImplHelper, - that would be ::cppu::WeakComponentImplHelperBase - */ - #define DECLARE_UNO3_XCOMPONENT_DEFAULTS(classname, baseclass, implhelper) \ - virtual void SAL_CALL acquire() throw() { baseclass::acquire(); } \ - virtual void SAL_CALL release() throw() { baseclass::release(); } \ - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) \ - { \ - implhelper::dispose(); \ - } \ - virtual void SAL_CALL addEventListener( \ - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) throw (::com::sun::star::uno::RuntimeException) \ - { \ - implhelper::addEventListener(xListener); \ - } \ - virtual void SAL_CALL removeEventListener( \ - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) throw (::com::sun::star::uno::RuntimeException) \ - { \ - implhelper::removeEventListener(xListener); \ - } \ - void SAL_CALL PUT_SEMICOLON_AT_THE_END() - + { return baseclass::queryInterface(_rType); } /** Use this macro to forward XComponent methods to base class @@ -139,10 +95,7 @@ namespace comphelper ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ { \ implhelper::removeEventListener(xListener); \ - } \ - void SAL_CALL PUT_SEMICOLON_AT_THE_END() - - + } //= deriving from multiple XInterface-derived classes diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index 3ec3b7b255d0..19a34f1dafbf 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -96,7 +96,7 @@ namespace svt public: // UNO - DECLARE_UNO3_DEFAULTS(OGenericUnoDialog, OGenericUnoDialogBase); + DECLARE_UNO3_DEFAULTS(OGenericUnoDialog, OGenericUnoDialogBase) virtual com::sun::star::uno::Any SAL_CALL queryInterface(const com::sun::star::uno::Type& _rType) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider diff --git a/include/svx/fmdpage.hxx b/include/svx/fmdpage.hxx index 86ed1fce828d..ea78b789f8c8 100644 --- a/include/svx/fmdpage.hxx +++ b/include/svx/fmdpage.hxx @@ -47,7 +47,7 @@ public: virtual ~SvxFmDrawPage() throw (); // UNO connection - DECLARE_UNO3_AGG_DEFAULTS(SvxFmDrawPage, SvxDrawPage); + DECLARE_UNO3_AGG_DEFAULTS(SvxFmDrawPage, SvxDrawPage) 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; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx index 1b548f6b7a6c..1f2b2c59df37 100644 --- a/include/svx/fmgridif.hxx +++ b/include/svx/fmgridif.hxx @@ -78,7 +78,7 @@ class FmXModifyMultiplexer :public OWeakSubObject { public: FmXModifyMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex ); - DECLARE_UNO3_DEFAULTS(FmXModifyMultiplexer,OWeakSubObject); + DECLARE_UNO3_DEFAULTS(FmXModifyMultiplexer,OWeakSubObject) virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XEventListener @@ -101,7 +101,7 @@ class FmXUpdateMultiplexer : public OWeakSubObject, { public: FmXUpdateMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex ); - DECLARE_UNO3_DEFAULTS(FmXUpdateMultiplexer,OWeakSubObject); + DECLARE_UNO3_DEFAULTS(FmXUpdateMultiplexer,OWeakSubObject) virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -126,7 +126,7 @@ class FmXSelectionMultiplexer :public OWeakSubObject { public: FmXSelectionMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex ); - DECLARE_UNO3_DEFAULTS(FmXSelectionMultiplexer, OWeakSubObject); + DECLARE_UNO3_DEFAULTS(FmXSelectionMultiplexer, OWeakSubObject) virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -150,7 +150,7 @@ class FmXGridControlMultiplexer :public OWeakSubObject { public: FmXGridControlMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex ); - DECLARE_UNO3_DEFAULTS( FmXGridControlMultiplexer, OWeakSubObject ); + DECLARE_UNO3_DEFAULTS( FmXGridControlMultiplexer, OWeakSubObject ) virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -174,7 +174,7 @@ class FmXContainerMultiplexer : public OWeakSubObject, { public: FmXContainerMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex); - DECLARE_UNO3_DEFAULTS(FmXContainerMultiplexer,OWeakSubObject); + DECLARE_UNO3_DEFAULTS(FmXContainerMultiplexer,OWeakSubObject) virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XEventListener @@ -226,7 +226,7 @@ public: virtual ~FmXGridControl(); // UNO connection - DECLARE_UNO3_AGG_DEFAULTS(FmXGridControl, UnoControl); + DECLARE_UNO3_AGG_DEFAULTS(FmXGridControl, UnoControl) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider @@ -379,7 +379,7 @@ public: void Create(Window* pParent, WinBits nStyle); // UNO connection - DECLARE_UNO3_DEFAULTS(FmXGridPeer, VCLXWindow); + DECLARE_UNO3_DEFAULTS(FmXGridPeer, VCLXWindow) virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx index 00d030ab3c1d..99d3c4204827 100644 --- a/include/svx/fmsrcimp.hxx +++ b/include/svx/fmsrcimp.hxx @@ -97,7 +97,7 @@ public: // the set has to support the sdb::ResultSet service virtual ~FmRecordCountListener(); - // DECLARE_UNO3_AGG_DEFAULTS(FmPropertyListener, UsrObject); + // DECLARE_UNO3_AGG_DEFAULTS(FmPropertyListener, UsrObject) // virtual sal_Bool queryInterface(::com::sun::star::uno::Uik aUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rOut); // ::com::sun::star::lang::XEventListener diff --git a/include/toolkit/controls/tkthrobber.hxx b/include/toolkit/controls/tkthrobber.hxx index f952b2785b01..972690e173ec 100644 --- a/include/toolkit/controls/tkthrobber.hxx +++ b/include/toolkit/controls/tkthrobber.hxx @@ -75,7 +75,7 @@ namespace toolkit UnoThrobberControl(); OUString GetComponentServiceName(); - DECLARE_UNO3_AGG_DEFAULTS( UnoThrobberControl, UnoControlBase ); + DECLARE_UNO3_AGG_DEFAULTS( UnoThrobberControl, UnoControlBase ) ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); |