1 files changed, 18 insertions, 18 deletions
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index 3acc0733f646..292e18890798 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -1212,29 +1212,29 @@ public:
     ~ImplementationRegistration();
 
     // XServiceInfo
-    OUString                        SAL_CALL getImplementationName() throw(RuntimeException);
-    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) throw(RuntimeException);
-    Sequence< OUString >            SAL_CALL getSupportedServiceNames(void) throw(RuntimeException);
+    OUString                        SAL_CALL getImplementationName() throw(RuntimeException, std::exception);
+    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) throw(RuntimeException, std::exception);
+    Sequence< OUString >            SAL_CALL getSupportedServiceNames(void) throw(RuntimeException, std::exception);
 
     // XImplementationRegistration
     virtual void SAL_CALL registerImplementation(
         const OUString& implementationLoader,
         const OUString& location,
         const Reference < XSimpleRegistry > & xReg)
-        throw(  CannotRegisterImplementationException, RuntimeException );
+        throw(  CannotRegisterImplementationException, RuntimeException, std::exception );
 
     virtual sal_Bool SAL_CALL revokeImplementation(
         const OUString& location,
         const Reference < XSimpleRegistry >& xReg)
-        throw( RuntimeException );
+        throw( RuntimeException, std::exception );
 
     virtual Sequence< OUString > SAL_CALL getImplementations(
         const OUString& implementationLoader,
         const OUString& location)
-        throw( RuntimeException );
+        throw( RuntimeException, std::exception );
     virtual Sequence< OUString > SAL_CALL checkInstantiation(
         const OUString& implementationName)
-        throw( RuntimeException );
+        throw( RuntimeException, std::exception );
 
     // XImplementationRegistration2
     virtual void SAL_CALL registerImplementationWithLocation(
@@ -1242,12 +1242,12 @@ public:
         const OUString& location,
         const OUString& registeredLocation,
         const Reference < XSimpleRegistry > & xReg)
-        throw(  CannotRegisterImplementationException, RuntimeException );
+        throw(  CannotRegisterImplementationException, 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);
+        throw(  ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception);
 
 private: // helper methods
     void prepareRegister(
@@ -1296,19 +1296,19 @@ ImplementationRegistration::ImplementationRegistration( const Reference < XCompo
 ImplementationRegistration::~ImplementationRegistration() {}
 
 // XServiceInfo
-OUString ImplementationRegistration::getImplementationName() throw(RuntimeException)
+OUString ImplementationRegistration::getImplementationName() throw(RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.stoc.ImplementationRegistration");
 }
 
 // XServiceInfo
-sal_Bool ImplementationRegistration::supportsService(const OUString& ServiceName) throw(RuntimeException)
+sal_Bool ImplementationRegistration::supportsService(const OUString& ServiceName) throw(RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > ImplementationRegistration::getSupportedServiceNames(void) throw(RuntimeException)
+Sequence< OUString > ImplementationRegistration::getSupportedServiceNames(void) throw(RuntimeException, std::exception)
 {
     Sequence< OUString > seqNames(1);
     seqNames[0] = "com.sun.star.registry.ImplementationRegistration";
@@ -1344,7 +1344,7 @@ Reference< XSimpleRegistry > ImplementationRegistration::getRegistryFromServiceM
 
 void ImplementationRegistration::initialize(
     const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArgs )
-    throw(  ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
+    throw(  ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception)
 {
 
     if( aArgs.getLength() != 4 ) {
@@ -1438,7 +1438,7 @@ void ImplementationRegistration::registerImplementationWithLocation(
     const OUString& locationUrl,
     const OUString& registeredLocationUrl,
     const Reference < XSimpleRegistry > & xReg)
-    throw( CannotRegisterImplementationException, RuntimeException )
+    throw( CannotRegisterImplementationException, RuntimeException, std::exception )
 {
     prepareRegister(
         implementationLoaderUrl, locationUrl, registeredLocationUrl, xReg);
@@ -1543,7 +1543,7 @@ void ImplementationRegistration::registerImplementation(
     const OUString& implementationLoaderUrl,
     const OUString& locationUrl,
     const Reference < XSimpleRegistry > & xReg)
-    throw( CannotRegisterImplementationException, RuntimeException )
+    throw( CannotRegisterImplementationException, RuntimeException, std::exception )
 {
     prepareRegister(implementationLoaderUrl, locationUrl, locationUrl, xReg);
 }
@@ -1554,7 +1554,7 @@ void ImplementationRegistration::registerImplementation(
 
 sal_Bool ImplementationRegistration::revokeImplementation(const OUString& location,
                                                       const Reference < XSimpleRegistry >& xReg)
-    throw ( RuntimeException )
+    throw ( RuntimeException, std::exception )
 {
     sal_Bool ret = sal_False;
 
@@ -1603,7 +1603,7 @@ sal_Bool ImplementationRegistration::revokeImplementation(const OUString& locati
 Sequence< OUString > ImplementationRegistration::getImplementations(
     const OUString & implementationLoaderUrl,
     const OUString & locationUrl)
-    throw ( RuntimeException )
+    throw ( RuntimeException, std::exception )
 {
     OUString activatorName;
 
@@ -1684,7 +1684,7 @@ Sequence< OUString > ImplementationRegistration::getImplementations(
 // virtual function checkInstantiation of XImplementationRegistration
 
 Sequence< OUString > ImplementationRegistration::checkInstantiation(const OUString&)
-    throw ( RuntimeException )
+    throw ( RuntimeException, std::exception )
 {
     OSL_FAIL( "ImplementationRegistration::checkInstantiation not implemented" );
     return Sequence<OUString>();