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/javaloader | |
parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'stoc/source/javaloader')
-rw-r--r-- | stoc/source/javaloader/javaloader.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx index 164006f45b54..56c0feb18ee5 100644 --- a/stoc/source/javaloader/javaloader.cxx +++ b/stoc/source/javaloader/javaloader.cxx @@ -105,21 +105,21 @@ public: public: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw(RuntimeException); + throw(RuntimeException, std::exception); virtual Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw(RuntimeException); + throw(RuntimeException, std::exception); // XImplementationLoader virtual css::uno::Reference<XInterface> SAL_CALL activate( const OUString& implementationName, const OUString& implementationLoaderUrl, const OUString& locationUrl, const css::uno::Reference<XRegistryKey>& xKey) - throw(CannotActivateFactoryException, RuntimeException); + throw(CannotActivateFactoryException, RuntimeException, std::exception); virtual sal_Bool SAL_CALL writeRegistryInfo( const css::uno::Reference<XRegistryKey>& xKey, const OUString& implementationLoaderUrl, const OUString& locationUrl) - throw(CannotRegisterImplementationException, RuntimeException); + throw(CannotRegisterImplementationException, RuntimeException, std::exception); }; const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaLoader() @@ -316,19 +316,19 @@ JavaComponentLoader::~JavaComponentLoader() throw() // XServiceInfo OUString SAL_CALL JavaComponentLoader::getImplementationName() - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return loader_getImplementationName(); } sal_Bool SAL_CALL JavaComponentLoader::supportsService(const OUString & ServiceName) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence<OUString> SAL_CALL JavaComponentLoader::getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return loader_getSupportedServiceNames(); } @@ -339,7 +339,7 @@ Sequence<OUString> SAL_CALL JavaComponentLoader::getSupportedServiceNames() sal_Bool SAL_CALL JavaComponentLoader::writeRegistryInfo( const css::uno::Reference<XRegistryKey> & xKey, const OUString & blabla, const OUString & rLibName) - throw(CannotRegisterImplementationException, RuntimeException) + throw(CannotRegisterImplementationException, RuntimeException, std::exception) { const css::uno::Reference<XImplementationLoader> & loader = getJavaLoader(); if (loader.is()) @@ -353,7 +353,7 @@ sal_Bool SAL_CALL JavaComponentLoader::writeRegistryInfo( css::uno::Reference<XInterface> SAL_CALL JavaComponentLoader::activate( const OUString & rImplName, const OUString & blabla, const OUString & rLibName, const css::uno::Reference<XRegistryKey> & xKey) - throw(CannotActivateFactoryException, RuntimeException) + throw(CannotActivateFactoryException, RuntimeException, std::exception) { const css::uno::Reference<XImplementationLoader> & loader = getJavaLoader(); if (loader.is()) |