1 files changed, 24 insertions, 24 deletions
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx
index a19a39ecded0..17da37f73e75 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -70,20 +70,20 @@ public:
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException);
+        throw (css::uno::RuntimeException, std::exception);
 
     virtual sal_Bool SAL_CALL supportsService(
         OUString const & ServiceName)
-        throw (css::uno::RuntimeException);
+        throw (css::uno::RuntimeException, std::exception);
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames() throw (css::uno::RuntimeException);
+    getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception);
 
     // XModuleManager
     virtual OUString SAL_CALL identify(const css::uno::Reference< css::uno::XInterface >& xModule)
         throw(css::lang::IllegalArgumentException,
               css::frame::UnknownModuleException,
-              css::uno::RuntimeException         );
+              css::uno::RuntimeException, std::exception         );
 
     // XNameReplace
     virtual void SAL_CALL replaceByName(const OUString& sName ,
@@ -91,33 +91,33 @@ public:
         throw (css::lang::IllegalArgumentException   ,
                css::container::NoSuchElementException,
                css::lang::WrappedTargetException     ,
-               css::uno::RuntimeException            );
+               css::uno::RuntimeException, std::exception            );
 
     // XNameAccess
     virtual css::uno::Any SAL_CALL getByName(const OUString& sName)
         throw(css::container::NoSuchElementException,
               css::lang::WrappedTargetException     ,
-              css::uno::RuntimeException            );
+              css::uno::RuntimeException, std::exception            );
 
     virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-        throw(css::uno::RuntimeException);
+        throw(css::uno::RuntimeException, std::exception);
 
     virtual sal_Bool SAL_CALL hasByName(const OUString& sName)
-        throw(css::uno::RuntimeException);
+        throw(css::uno::RuntimeException, std::exception);
 
     // XElementAccess
     virtual css::uno::Type SAL_CALL getElementType()
-        throw(css::uno::RuntimeException);
+        throw(css::uno::RuntimeException, std::exception);
 
     virtual sal_Bool SAL_CALL hasElements()
-        throw(css::uno::RuntimeException);
+        throw(css::uno::RuntimeException, std::exception);
 
     // XContainerQuery
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const OUString& sQuery)
-        throw(css::uno::RuntimeException);
+        throw(css::uno::RuntimeException, std::exception);
 
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties(const css::uno::Sequence< css::beans::NamedValue >& lProperties)
-        throw(css::uno::RuntimeException);
+        throw(css::uno::RuntimeException, std::exception);
 
 private:
 
@@ -159,19 +159,19 @@ ModuleManager::~ModuleManager()
 }
 
 OUString ModuleManager::getImplementationName()
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.framework.ModuleManager");
 }
 
 sal_Bool ModuleManager::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence< OUString > ModuleManager::getSupportedServiceNames()
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence< OUString > s(1);
     s[0] = "com.sun.star.frame.ModuleManager";
@@ -181,7 +181,7 @@ css::uno::Sequence< OUString > ModuleManager::getSupportedServiceNames()
 OUString SAL_CALL ModuleManager::identify(const css::uno::Reference< css::uno::XInterface >& xModule)
     throw(css::lang::IllegalArgumentException,
           css::frame::UnknownModuleException,
-          css::uno::RuntimeException         )
+          css::uno::RuntimeException, std::exception         )
 {
     // valid parameter?
     css::uno::Reference< css::frame::XFrame >      xFrame     (xModule, css::uno::UNO_QUERY);
@@ -236,7 +236,7 @@ void SAL_CALL ModuleManager::replaceByName(const OUString& sName ,
     throw (css::lang::IllegalArgumentException   ,
            css::container::NoSuchElementException,
            css::lang::WrappedTargetException     ,
-           css::uno::RuntimeException            )
+           css::uno::RuntimeException, std::exception            )
 {
     try
     {
@@ -296,7 +296,7 @@ void SAL_CALL ModuleManager::replaceByName(const OUString& sName ,
 css::uno::Any SAL_CALL ModuleManager::getByName(const OUString& sName)
     throw(css::container::NoSuchElementException,
           css::lang::WrappedTargetException     ,
-          css::uno::RuntimeException            )
+          css::uno::RuntimeException, std::exception            )
 {
     // get access to the element
     css::uno::Reference< css::container::XNameAccess > xModule;
@@ -323,37 +323,37 @@ css::uno::Any SAL_CALL ModuleManager::getByName(const OUString& sName)
 }
 
 css::uno::Sequence< OUString > SAL_CALL ModuleManager::getElementNames()
-    throw(css::uno::RuntimeException)
+    throw(css::uno::RuntimeException, std::exception)
 {
     return m_xCFG->getElementNames();
 }
 
 sal_Bool SAL_CALL ModuleManager::hasByName(const OUString& sName)
-    throw(css::uno::RuntimeException)
+    throw(css::uno::RuntimeException, std::exception)
 {
     return m_xCFG->hasByName(sName);
 }
 
 css::uno::Type SAL_CALL ModuleManager::getElementType()
-    throw(css::uno::RuntimeException)
+    throw(css::uno::RuntimeException, std::exception)
 {
     return ::getCppuType((const css::uno::Sequence< css::beans::PropertyValue >*)0);
 }
 
 sal_Bool SAL_CALL ModuleManager::hasElements()
-    throw(css::uno::RuntimeException)
+    throw(css::uno::RuntimeException, std::exception)
 {
     return m_xCFG->hasElements();
 }
 
 css::uno::Reference< css::container::XEnumeration > SAL_CALL ModuleManager::createSubSetEnumerationByQuery(const OUString&)
-    throw(css::uno::RuntimeException)
+    throw(css::uno::RuntimeException, std::exception)
 {
     return css::uno::Reference< css::container::XEnumeration >();
 }
 
 css::uno::Reference< css::container::XEnumeration > SAL_CALL ModuleManager::createSubSetEnumerationByProperties(const css::uno::Sequence< css::beans::NamedValue >& lProperties)
-    throw(css::uno::RuntimeException)
+    throw(css::uno::RuntimeException, std::exception)
 {
     ::comphelper::SequenceAsHashMap lSearchProps(lProperties);
     const css::uno::Sequence< OUString > lModules = getElementNames();