diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 21:31:58 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-26 18:22:20 +0100 |
commit | 5e21a413c788f839a66d9e4c14e745ed18058db8 (patch) | |
tree | d4451246461346a425ad6f796e08bf1514cdd942 /cppuhelper/source/implbase.cxx | |
parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'cppuhelper/source/implbase.cxx')
-rw-r--r-- | cppuhelper/source/implbase.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx index ecf7f9a36b15..dbd11f9a1245 100644 --- a/cppuhelper/source/implbase.cxx +++ b/cppuhelper/source/implbase.cxx @@ -213,7 +213,7 @@ void WeakComponentImplHelperBase::disposing() } Any WeakComponentImplHelperBase::queryInterface( Type const & rType ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rType == ::getCppuType( (Reference< lang::XComponent > const *)0 )) { @@ -254,7 +254,7 @@ void WeakComponentImplHelperBase::release() } void WeakComponentImplHelperBase::dispose() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ClearableMutexGuard aGuard( rBHelper.rMutex ); if (!rBHelper.bDisposed && !rBHelper.bInDispose) @@ -299,7 +299,7 @@ void WeakComponentImplHelperBase::dispose() void WeakComponentImplHelperBase::addEventListener( Reference< lang::XEventListener > const & xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ClearableMutexGuard aGuard( rBHelper.rMutex ); if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -316,7 +316,7 @@ void WeakComponentImplHelperBase::addEventListener( void WeakComponentImplHelperBase::removeEventListener( Reference< lang::XEventListener > const & xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { rBHelper.removeListener( ::getCppuType( &xListener ), xListener ); } @@ -339,13 +339,13 @@ void WeakAggComponentImplHelperBase::disposing() } Any WeakAggComponentImplHelperBase::queryInterface( Type const & rType ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return OWeakAggObject::queryInterface( rType ); } Any WeakAggComponentImplHelperBase::queryAggregation( Type const & rType ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rType == ::getCppuType( (Reference< lang::XComponent > const *)0 )) { @@ -390,7 +390,7 @@ void WeakAggComponentImplHelperBase::release() } void WeakAggComponentImplHelperBase::dispose() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ClearableMutexGuard aGuard( rBHelper.rMutex ); if (!rBHelper.bDisposed && !rBHelper.bInDispose) @@ -435,7 +435,7 @@ void WeakAggComponentImplHelperBase::dispose() void WeakAggComponentImplHelperBase::addEventListener( Reference< lang::XEventListener > const & xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ClearableMutexGuard aGuard( rBHelper.rMutex ); if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -452,7 +452,7 @@ void WeakAggComponentImplHelperBase::addEventListener( void WeakAggComponentImplHelperBase::removeEventListener( Reference< lang::XEventListener > const & xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { rBHelper.removeListener( ::getCppuType( &xListener ), xListener ); } |