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 /stoc/source/namingservice/namingservice.cxx | |
parent | Fixup whitespace changes, remove commented code. (diff) | |
download | core-5e21a413c788f839a66d9e4c14e745ed18058db8.tar.gz core-5e21a413c788f839a66d9e4c14e745ed18058db8.zip |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'stoc/source/namingservice/namingservice.cxx')
-rw-r--r-- | stoc/source/namingservice/namingservice.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx index 96eafee5f86d..8d88c14dc28d 100644 --- a/stoc/source/namingservice/namingservice.cxx +++ b/stoc/source/namingservice/namingservice.cxx @@ -93,20 +93,20 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static() { OUString aStr( SERVICENAME ); return Sequence< OUString >( &aStr, 1 ); } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRegisteredObject( const OUString& Name ) throw(Exception, RuntimeException); - virtual void SAL_CALL registerObject( const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Object ) throw(Exception, RuntimeException); - virtual void SAL_CALL revokeObject( const OUString& Name ) throw(Exception, RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRegisteredObject( const OUString& Name ) throw(Exception, RuntimeException, std::exception); + virtual void SAL_CALL registerObject( const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Object ) throw(Exception, RuntimeException, std::exception); + virtual void SAL_CALL revokeObject( const OUString& Name ) throw(Exception, RuntimeException, std::exception); }; @@ -124,27 +124,27 @@ NamingService_Impl::~NamingService_Impl() {} // XServiceInfo OUString NamingService_Impl::getImplementationName() - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return ns_getImplementationName(); } // XServiceInfo sal_Bool NamingService_Impl::supportsService( const OUString & rServiceName ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } // XServiceInfo Sequence< OUString > NamingService_Impl::getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return ns_getSupportedServiceNames(); } // XServiceInfo -Reference< XInterface > NamingService_Impl::getRegisteredObject( const OUString& Name ) throw(Exception, RuntimeException) +Reference< XInterface > NamingService_Impl::getRegisteredObject( const OUString& Name ) throw(Exception, RuntimeException, std::exception) { Guard< Mutex > aGuard( aMutex ); Reference< XInterface > xRet; @@ -155,14 +155,14 @@ Reference< XInterface > NamingService_Impl::getRegisteredObject( const OUString& } // XServiceInfo -void NamingService_Impl::registerObject( const OUString& Name, const Reference< XInterface >& Object ) throw(Exception, RuntimeException) +void NamingService_Impl::registerObject( const OUString& Name, const Reference< XInterface >& Object ) throw(Exception, RuntimeException, std::exception) { Guard< Mutex > aGuard( aMutex ); aMap[ Name ] = Object; } // XServiceInfo -void NamingService_Impl::revokeObject( const OUString& Name ) throw(Exception, RuntimeException) +void NamingService_Impl::revokeObject( const OUString& Name ) throw(Exception, RuntimeException, std::exception) { Guard< Mutex > aGuard( aMutex ); aMap.erase( Name ); |