1 files changed, 12 insertions, 49 deletions
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx
index 53f89089a309..b4a602f77a1c 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -65,55 +65,37 @@ public:
     ModuleManager& operator=(const ModuleManager&) = delete;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
     virtual sal_Bool SAL_CALL supportsService(
-        OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+        OUString const & ServiceName) override;
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    getSupportedServiceNames() override;
 
     // XModuleManager
-    virtual OUString SAL_CALL identify(const css::uno::Reference< css::uno::XInterface >& xModule)
-        throw(css::lang::IllegalArgumentException,
-              css::frame::UnknownModuleException,
-              css::uno::RuntimeException, std::exception         ) override;
+    virtual OUString SAL_CALL identify(const css::uno::Reference< css::uno::XInterface >& xModule) override;
 
     // XNameReplace
     virtual void SAL_CALL replaceByName(const OUString& sName ,
-                                        const css::uno::Any&   aValue)
-        throw (css::lang::IllegalArgumentException   ,
-               css::container::NoSuchElementException,
-               css::lang::WrappedTargetException     ,
-               css::uno::RuntimeException, std::exception            ) override;
+                                        const css::uno::Any&   aValue) override;
 
     // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName(const OUString& sName)
-        throw(css::container::NoSuchElementException,
-              css::lang::WrappedTargetException     ,
-              css::uno::RuntimeException, std::exception            ) override;
+    virtual css::uno::Any SAL_CALL getByName(const OUString& sName) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
 
-    virtual sal_Bool SAL_CALL hasByName(const OUString& sName)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasByName(const OUString& sName) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
 
-    virtual sal_Bool SAL_CALL hasElements()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XContainerQuery
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const OUString& sQuery)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const OUString& sQuery) override;
 
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties(const css::uno::Sequence< css::beans::NamedValue >& lProperties)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties(const css::uno::Sequence< css::beans::NamedValue >& lProperties) override;
 
 private:
 
@@ -150,27 +132,21 @@ ModuleManager::ModuleManager(const css::uno::Reference< css::uno::XComponentCont
 }
 
 OUString ModuleManager::getImplementationName()
-    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, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence< OUString > ModuleManager::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return { "com.sun.star.frame.ModuleManager" };
 }
 
 OUString SAL_CALL ModuleManager::identify(const css::uno::Reference< css::uno::XInterface >& xModule)
-    throw(css::lang::IllegalArgumentException,
-          css::frame::UnknownModuleException,
-          css::uno::RuntimeException, std::exception         )
 {
     // valid parameter?
     css::uno::Reference< css::frame::XFrame >      xFrame     (xModule, css::uno::UNO_QUERY);
@@ -222,10 +198,6 @@ OUString SAL_CALL ModuleManager::identify(const css::uno::Reference< css::uno::X
 
 void SAL_CALL ModuleManager::replaceByName(const OUString& sName ,
                                            const css::uno::Any&   aValue)
-    throw (css::lang::IllegalArgumentException   ,
-           css::container::NoSuchElementException,
-           css::lang::WrappedTargetException     ,
-           css::uno::RuntimeException, std::exception            )
 {
     ::comphelper::SequenceAsHashMap lProps(aValue);
     if (lProps.empty() )
@@ -273,9 +245,6 @@ 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, std::exception            )
 {
     // get access to the element
     css::uno::Reference< css::container::XNameAccess > xModule;
@@ -302,37 +271,31 @@ css::uno::Any SAL_CALL ModuleManager::getByName(const OUString& sName)
 }
 
 css::uno::Sequence< OUString > SAL_CALL ModuleManager::getElementNames()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return m_xCFG->getElementNames();
 }
 
 sal_Bool SAL_CALL ModuleManager::hasByName(const OUString& sName)
-    throw(css::uno::RuntimeException, std::exception)
 {
     return m_xCFG->hasByName(sName);
 }
 
 css::uno::Type SAL_CALL ModuleManager::getElementType()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get();
 }
 
 sal_Bool SAL_CALL ModuleManager::hasElements()
-    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, 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, std::exception)
 {
     ::comphelper::SequenceAsHashMap lSearchProps(lProperties);
     const css::uno::Sequence< OUString > lModules = getElementNames();