1 files changed, 20 insertions, 42 deletions
diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx
index b314f479f54f..3b48a37602a7 100644
--- a/sd/source/ui/inc/framework/ConfigurationController.hxx
+++ b/sd/source/ui/inc/framework/ConfigurationController.hxx
@@ -79,46 +79,35 @@ public:
 
     // XConfigurationController
 
-    virtual void SAL_CALL lock()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+    virtual void SAL_CALL lock() override;
 
-    virtual void SAL_CALL unlock()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL unlock() override;
 
     virtual void SAL_CALL requestResourceActivation (
         const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId,
-        css::drawing::framework::ResourceActivationMode eMode)
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::drawing::framework::ResourceActivationMode eMode) override;
 
     virtual void SAL_CALL requestResourceDeactivation (
         const css::uno::Reference<css::drawing::framework::XResourceId>&
-            rxResourceId)
-        throw (css::uno::RuntimeException, std::exception) override;
+            rxResourceId) override;
 
     virtual css::uno::Reference<css::drawing::framework::XResource>
         SAL_CALL getResource (
-            const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId) override;
 
-    virtual void SAL_CALL update()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL update() override;
 
     virtual  css::uno::Reference<
         css::drawing::framework::XConfiguration>
-        SAL_CALL getRequestedConfiguration()
-        throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getRequestedConfiguration() override;
 
     virtual  css::uno::Reference<
         css::drawing::framework::XConfiguration>
-        SAL_CALL getCurrentConfiguration()
-        throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getCurrentConfiguration() override;
 
     virtual void SAL_CALL restoreConfiguration (
         const css::uno::Reference<css::drawing::framework::XConfiguration>&
-        rxConfiguration)
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+        rxConfiguration) override;
 
     // XConfigurationControllerBroadcaster
 
@@ -126,53 +115,43 @@ public:
         const css::uno::Reference<
             css::drawing::framework::XConfigurationChangeListener>& rxListener,
         const OUString& rsEventType,
-        const css::uno::Any& rUserData)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Any& rUserData) override;
 
     virtual void SAL_CALL removeConfigurationChangeListener (
         const css::uno::Reference<
-            css::drawing::framework::XConfigurationChangeListener>& rxListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            css::drawing::framework::XConfigurationChangeListener>& rxListener) override;
 
     virtual void SAL_CALL notifyEvent (
-        const css::drawing::framework::ConfigurationChangeEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::drawing::framework::ConfigurationChangeEvent& rEvent) override;
 
     // XConfigurationRequestQueue
 
-    virtual sal_Bool SAL_CALL hasPendingRequests()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasPendingRequests() override;
 
     virtual void SAL_CALL postChangeRequest (
         const css::uno::Reference<
-            css::drawing::framework::XConfigurationChangeRequest>& rxRequest)
-        throw (css::uno::RuntimeException, std::exception) override;
+            css::drawing::framework::XConfigurationChangeRequest>& rxRequest) override;
 
     // XResourceFactoryManager
 
     virtual void SAL_CALL addResourceFactory(
         const OUString& sResourceURL,
-        const css::uno::Reference<css::drawing::framework::XResourceFactory>& rxResourceFactory)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::drawing::framework::XResourceFactory>& rxResourceFactory) override;
 
     virtual void SAL_CALL removeResourceFactoryForURL(
-        const OUString& sResourceURL)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const OUString& sResourceURL) override;
 
     virtual void SAL_CALL removeResourceFactoryForReference(
-        const css::uno::Reference<css::drawing::framework::XResourceFactory>& rxResourceFactory)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::drawing::framework::XResourceFactory>& rxResourceFactory) override;
 
     virtual css::uno::Reference<css::drawing::framework::XResourceFactory>
         SAL_CALL getResourceFactory (
-        const OUString& sResourceURL)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const OUString& sResourceURL) override;
 
     // XInitialization
 
     virtual void SAL_CALL initialize(
-        const css::uno::Sequence<css::uno::Any>& rArguments)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence<css::uno::Any>& rArguments) override;
 
     /** Use this class instead of calling lock() and unlock() directly in
         order to be exception safe.
@@ -199,8 +178,7 @@ private:
         @throws css::lang::DisposedException
         @throws css::uno::RuntimeException
     */
-    void ThrowIfDisposed () const
-        throw (css::lang::DisposedException, css::uno::RuntimeException);
+    void ThrowIfDisposed () const;
 };
 
 } } // end of namespace sd::framework