summaryrefslogtreecommitdiff
path: root/stoc/source/loader/dllcomponentloader.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-25 21:31:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-26 18:22:20 +0100
commit5e21a413c788f839a66d9e4c14e745ed18058db8 (patch)
treed4451246461346a425ad6f796e08bf1514cdd942 /stoc/source/loader/dllcomponentloader.cxx
parent6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff)
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'stoc/source/loader/dllcomponentloader.cxx')
-rw-r--r--stoc/source/loader/dllcomponentloader.cxx24
1 files changed, 12 insertions, 12 deletions
diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx
index d92ecf4a870c..377df303826c 100644
--- a/stoc/source/loader/dllcomponentloader.cxx
+++ b/stoc/source/loader/dllcomponentloader.cxx
@@ -62,16 +62,16 @@ public:
~DllComponentLoader();
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
- virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
// XInitialization
- virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception);
// XImplementationLoader
- virtual Reference<XInterface> SAL_CALL activate( const OUString& implementationName, const OUString& implementationLoaderUrl, const OUString& locationUrl, const Reference<XRegistryKey>& xKey ) throw(CannotActivateFactoryException, RuntimeException);
- virtual sal_Bool SAL_CALL writeRegistryInfo( const Reference<XRegistryKey>& xKey, const OUString& implementationLoaderUrl, const OUString& locationUrl ) throw(CannotRegisterImplementationException, RuntimeException);
+ virtual Reference<XInterface> SAL_CALL activate( const OUString& implementationName, const OUString& implementationLoaderUrl, const OUString& locationUrl, const Reference<XRegistryKey>& xKey ) throw(CannotActivateFactoryException, RuntimeException, std::exception);
+ virtual sal_Bool SAL_CALL writeRegistryInfo( const Reference<XRegistryKey>& xKey, const OUString& implementationLoaderUrl, const OUString& locationUrl ) throw(CannotRegisterImplementationException, RuntimeException, std::exception);
private:
Reference<XMultiServiceFactory> m_xSMgr;
@@ -88,19 +88,19 @@ DllComponentLoader::~DllComponentLoader() {}
OUString SAL_CALL DllComponentLoader::getImplementationName( )
- throw(::com::sun::star::uno::RuntimeException)
+ throw(::com::sun::star::uno::RuntimeException, std::exception)
{
return OUString("com.sun.star.comp.stoc.DLLComponentLoader");
}
sal_Bool SAL_CALL DllComponentLoader::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 DllComponentLoader::getSupportedServiceNames( )
- throw(::com::sun::star::uno::RuntimeException)
+ throw(::com::sun::star::uno::RuntimeException, std::exception)
{
Sequence< OUString > seqNames(1);
seqNames[0] = "com.sun.star.loader.SharedLibrary";
@@ -109,7 +109,7 @@ Sequence<OUString> SAL_CALL DllComponentLoader::getSupportedServiceNames( )
void DllComponentLoader::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& )
- throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
+ throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception)
{
OSL_FAIL( "dllcomponentloader::initialize should not be called !" );
// if( aArgs.getLength() != 1 )
@@ -137,7 +137,7 @@ Reference<XInterface> SAL_CALL DllComponentLoader::activate(
const OUString & rImplName, const OUString &, const OUString & rLibName,
const Reference< XRegistryKey > & )
- throw(CannotActivateFactoryException, RuntimeException)
+ throw(CannotActivateFactoryException, RuntimeException, std::exception)
{
return loadSharedLibComponentFactory(
cppu::bootstrap_expandUri(rLibName), OUString(), rImplName, m_xSMgr,
@@ -149,7 +149,7 @@ Reference<XInterface> SAL_CALL DllComponentLoader::activate(
sal_Bool SAL_CALL DllComponentLoader::writeRegistryInfo(
const Reference< XRegistryKey > & xKey, const OUString &, const OUString & rLibName )
- throw(CannotRegisterImplementationException, RuntimeException)
+ throw(CannotRegisterImplementationException, RuntimeException, std::exception)
{
#ifdef DISABLE_DYNLOADING
(void) xKey;