diff options
Diffstat (limited to 'comphelper/source/misc/instancelocker.cxx')
-rw-r--r-- | comphelper/source/misc/instancelocker.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/comphelper/source/misc/instancelocker.cxx b/comphelper/source/misc/instancelocker.cxx index 4563ac21f2f4..93bbbec7277d 100644 --- a/comphelper/source/misc/instancelocker.cxx +++ b/comphelper/source/misc/instancelocker.cxx @@ -71,7 +71,7 @@ OInstanceLocker::~OInstanceLocker() // XComponent void SAL_CALL OInstanceLocker::dispose() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -97,7 +97,7 @@ void SAL_CALL OInstanceLocker::dispose() void SAL_CALL OInstanceLocker::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_bDisposed ) @@ -111,7 +111,7 @@ void SAL_CALL OInstanceLocker::addEventListener( const uno::Reference< lang::XEv void SAL_CALL OInstanceLocker::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_pListenersContainer ) @@ -121,7 +121,7 @@ void SAL_CALL OInstanceLocker::removeEventListener( const uno::Reference< lang:: // XInitialization void SAL_CALL OInstanceLocker::initialize( const uno::Sequence< uno::Any >& aArguments ) - throw (uno::Exception, uno::RuntimeException) + throw (uno::Exception, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_bInitialized ) @@ -190,19 +190,19 @@ void SAL_CALL OInstanceLocker::initialize( const uno::Sequence< uno::Any >& aArg // XServiceInfo OUString SAL_CALL OInstanceLocker::getImplementationName( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return getImplementationName_static(); } ::sal_Bool SAL_CALL OInstanceLocker::supportsService( const OUString& ServiceName ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL OInstanceLocker::getSupportedServiceNames() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return getSupportedServiceNames_static(); } @@ -295,7 +295,7 @@ void OLockListener::Dispose() // XEventListener void SAL_CALL OLockListener::disposing( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aGuard( m_aMutex ); @@ -320,7 +320,7 @@ void SAL_CALL OLockListener::disposing( const lang::EventObject& aEvent ) // XCloseListener void SAL_CALL OLockListener::queryClosing( const lang::EventObject& aEvent, sal_Bool ) - throw (util::CloseVetoException, uno::RuntimeException) + throw (util::CloseVetoException, uno::RuntimeException, std::exception) { // GetsOwnership parameter is always ignored, the user of the service must close the object always ::osl::ResettableMutexGuard aGuard( m_aMutex ); @@ -350,7 +350,7 @@ void SAL_CALL OLockListener::queryClosing( const lang::EventObject& aEvent, sal_ void SAL_CALL OLockListener::notifyClosing( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aGuard( m_aMutex ); @@ -381,7 +381,7 @@ void SAL_CALL OLockListener::notifyClosing( const lang::EventObject& aEvent ) // XTerminateListener void SAL_CALL OLockListener::queryTermination( const lang::EventObject& aEvent ) - throw (frame::TerminationVetoException, uno::RuntimeException) + throw (frame::TerminationVetoException, uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aGuard( m_aMutex ); if ( aEvent.Source == m_xInstance && ( m_nMode & embed::Actions::PREVENT_TERMINATION ) ) @@ -410,7 +410,7 @@ void SAL_CALL OLockListener::queryTermination( const lang::EventObject& aEvent ) void SAL_CALL OLockListener::notifyTermination( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aGuard( m_aMutex ); |