diff options
| -rw-r--r-- | include/toolkit/helper/macros.hxx | 10 | ||||
| -rw-r--r-- | toolkit/source/helper/listenermultiplexer.cxx | 9 |
2 files changed, 15 insertions, 4 deletions
diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx index 43ef27a8483b..85474c8cf777 100644 --- a/include/toolkit/helper/macros.hxx +++ b/include/toolkit/helper/macros.hxx @@ -112,8 +112,8 @@ class ClassName : public ListenerMultiplexerBase, public InterfaceName \ public: \ ClassName( ::cppu::OWeakObject& rSource ); \ ::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; \ - void SAL_CALL acquire() throw() SAL_OVERRIDE { ListenerMultiplexerBase::acquire(); } \ - void SAL_CALL release() throw() SAL_OVERRIDE { ListenerMultiplexerBase::release(); } \ + void SAL_CALL acquire() throw() SAL_OVERRIDE; \ + void SAL_CALL release() throw() SAL_OVERRIDE; \ void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -124,8 +124,8 @@ class TOOLKIT_DLLPUBLIC ClassName : public ListenerMultiplexerBase, public Inter public: \ ClassName( ::cppu::OWeakObject& rSource ); \ ::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; \ - void SAL_CALL acquire() throw() SAL_OVERRIDE { ListenerMultiplexerBase::acquire(); } \ - void SAL_CALL release() throw() SAL_OVERRIDE { ListenerMultiplexerBase::release(); } \ + void SAL_CALL acquire() throw() SAL_OVERRIDE; \ + void SAL_CALL release() throw() SAL_OVERRIDE; \ void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -140,6 +140,8 @@ ClassName::ClassName( ::cppu::OWeakObject& rSource ) \ : ListenerMultiplexerBase( rSource ) \ { \ } \ +void SAL_CALL ClassName::acquire() throw() { ListenerMultiplexerBase::acquire(); } \ +void SAL_CALL ClassName::release() throw() { ListenerMultiplexerBase::release(); } \ ::com::sun::star::uno::Any ClassName::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) \ { \ ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, \ diff --git a/toolkit/source/helper/listenermultiplexer.cxx b/toolkit/source/helper/listenermultiplexer.cxx index 797fad2e0ce0..b109c5f3dd5d 100644 --- a/toolkit/source/helper/listenermultiplexer.cxx +++ b/toolkit/source/helper/listenermultiplexer.cxx @@ -47,6 +47,15 @@ EventListenerMultiplexer::EventListenerMultiplexer( ::cppu::OWeakObject& rSource { } +void SAL_CALL EventListenerMultiplexer::acquire() throw () +{ + return ListenerMultiplexerBase::acquire(); +} +void SAL_CALL EventListenerMultiplexer::release() throw () +{ + return ListenerMultiplexerBase::release(); +} + // ::com::sun::star::uno::XInterface ::com::sun::star::uno::Any EventListenerMultiplexer::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) { |