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 /comphelper/source/misc/officerestartmanager.cxx | |
parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'comphelper/source/misc/officerestartmanager.cxx')
-rw-r--r-- | comphelper/source/misc/officerestartmanager.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/comphelper/source/misc/officerestartmanager.cxx b/comphelper/source/misc/officerestartmanager.cxx index 7a02e234f81d..33a2a6526d5e 100644 --- a/comphelper/source/misc/officerestartmanager.cxx +++ b/comphelper/source/misc/officerestartmanager.cxx @@ -67,7 +67,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOfficeRestartManager::Create( const // XRestartManager void SAL_CALL OOfficeRestartManager::requestRestart( const uno::Reference< task::XInteractionHandler >& /* xInteractionHandler */ ) - throw (uno::Exception, uno::RuntimeException) + throw (uno::Exception, uno::RuntimeException, std::exception) { if ( !m_xContext.is() ) throw uno::RuntimeException(); @@ -109,7 +109,7 @@ void SAL_CALL OOfficeRestartManager::requestRestart( const uno::Reference< task: ::sal_Bool SAL_CALL OOfficeRestartManager::isRestartRequested( ::sal_Bool bOfficeInitialized ) - throw (uno::Exception, uno::RuntimeException) + throw (uno::Exception, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -122,7 +122,7 @@ void SAL_CALL OOfficeRestartManager::requestRestart( const uno::Reference< task: // XCallback void SAL_CALL OOfficeRestartManager::notify( const uno::Any& /* aData */ ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { try { @@ -164,17 +164,17 @@ void SAL_CALL OOfficeRestartManager::notify( const uno::Any& /* aData */ ) // XServiceInfo -OUString SAL_CALL OOfficeRestartManager::getImplementationName() throw (uno::RuntimeException) +OUString SAL_CALL OOfficeRestartManager::getImplementationName() throw (uno::RuntimeException, std::exception) { return getImplementationName_static(); } -::sal_Bool SAL_CALL OOfficeRestartManager::supportsService( const OUString& aServiceName ) throw (uno::RuntimeException) +::sal_Bool SAL_CALL OOfficeRestartManager::supportsService( const OUString& aServiceName ) throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, aServiceName); } -uno::Sequence< OUString > SAL_CALL OOfficeRestartManager::getSupportedServiceNames() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL OOfficeRestartManager::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { return getSupportedServiceNames_static(); } |