Remove dynamic exception specifications

...(for now, from LIBO_INTERNAL_CODE only).  See the mail thread starting at
<https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html>
"Dynamic Exception Specifications" for details.

Most changes have been done automatically by the rewriting loplugin:dynexcspec
(after enabling the rewriting mode, to be committed shortly).  The way it only
removes exception specs from declarations if it also sees a definition, it
identified some dead declarations-w/o-definitions (that have been removed
manually) and some cases where a definition appeared in multiple include files
(which have also been cleaned up manually).  There's also been cases of macro
paramters (that were used to abstract over exception specs) that have become
unused now (and been removed).

Furthermore, some code needed to be cleaned up manually
(avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no
configurations available that would actually build that code.  Missing @throws
documentation has not been applied in such manual clean-up.

Change-Id: I3408691256c9b0c12bc5332de976743626e13960
Reviewed-on: https://gerrit.libreoffice.org/33574
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

17 files changed, 80 insertions, 181 deletions

diff --git a/sfx2/source/appl/appdispatchprovider.cxx b/sfx2/source/appl/appdispatchprovider.cxx
index 2f2a53d289c9..5a8fb6b2104d 100644
--- a/sfx2/source/appl/appdispatchprovider.cxx
+++ b/sfx2/source/appl/appdispatchprovider.cxx
@@ -68,37 +68,28 @@ public:
     SfxAppDispatchProvider() {}
 
     virtual void SAL_CALL initialize(
-        css::uno::Sequence<css::uno::Any> const & aArguments)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        css::uno::Sequence<css::uno::Any> const & aArguments) override;
 
-    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;
+    virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     virtual css::uno::Reference < css::frame::XDispatch > SAL_CALL queryDispatch(
             const css::util::URL& aURL, const OUString& sTargetFrameName,
-            FrameSearchFlags eSearchFlags )
-        throw( css::uno::RuntimeException, std::exception ) override;
+            FrameSearchFlags eSearchFlags ) override;
 
     virtual css::uno::Sequence< css::uno::Reference < css::frame::XDispatch > > SAL_CALL queryDispatches(
-            const css::uno::Sequence < css::frame::DispatchDescriptor >& seqDescriptor )
-        throw( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Sequence < css::frame::DispatchDescriptor >& seqDescriptor ) override;
 
-    virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups() override;
 
-    virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 ) override;
 };
 
 void SfxAppDispatchProvider::initialize(
     css::uno::Sequence<css::uno::Any> const & aArguments)
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     css::uno::Reference<css::frame::XFrame> f;
     if (aArguments.getLength() != 1 || !(aArguments[0] >>= f)) {
@@ -109,17 +100,17 @@ void SfxAppDispatchProvider::initialize(
     m_xFrame = f;
 }
 
-OUString SAL_CALL SfxAppDispatchProvider::getImplementationName() throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL SfxAppDispatchProvider::getImplementationName()
 {
     return OUString( "com.sun.star.comp.sfx2.AppDispatchProvider" );
 }
 
-sal_Bool SAL_CALL SfxAppDispatchProvider::supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL SfxAppDispatchProvider::supportsService( const OUString& sServiceName )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
-css::uno::Sequence< OUString > SAL_CALL SfxAppDispatchProvider::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< OUString > SAL_CALL SfxAppDispatchProvider::getSupportedServiceNames()
 {
     css::uno::Sequence< OUString > seqServiceNames( 2 );
     seqServiceNames.getArray()[0] = "com.sun.star.frame.ProtocolHandler";
@@ -130,7 +121,7 @@ css::uno::Sequence< OUString > SAL_CALL SfxAppDispatchProvider::getSupportedServ
 Reference < XDispatch > SAL_CALL SfxAppDispatchProvider::queryDispatch(
     const util::URL& aURL,
     const OUString& /*sTargetFrameName*/,
-    FrameSearchFlags /*eSearchFlags*/ ) throw( RuntimeException, std::exception )
+    FrameSearchFlags /*eSearchFlags*/ )
 {
     SolarMutexGuard guard;
 
@@ -167,7 +158,6 @@ Reference < XDispatch > SAL_CALL SfxAppDispatchProvider::queryDispatch(
 }
 
 Sequence< Reference < XDispatch > > SAL_CALL SfxAppDispatchProvider::queryDispatches( const Sequence < DispatchDescriptor >& seqDescriptor )
-throw( RuntimeException, std::exception )
 {
     sal_Int32 nCount = seqDescriptor.getLength();
     uno::Sequence< uno::Reference < frame::XDispatch > > lDispatcher(nCount);
@@ -179,7 +169,6 @@ throw( RuntimeException, std::exception )
 }
 
 Sequence< sal_Int16 > SAL_CALL SfxAppDispatchProvider::getSupportedCommandGroups()
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -209,7 +198,6 @@ throw (uno::RuntimeException, std::exception)
 }
 
 Sequence< frame::DispatchInformation > SAL_CALL SfxAppDispatchProvider::getConfigurableDispatchInformation( sal_Int16 nCmdGroup )
-throw (uno::RuntimeException, std::exception)
 {
     std::list< frame::DispatchInformation > aCmdList;
 
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 93f634958c83..be792e5ddb05 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -79,25 +79,25 @@ class SfxTerminateListener_Impl : public ::cppu::WeakImplHelper< XTerminateListe
 public:
 
     // XTerminateListener
-    virtual void SAL_CALL queryTermination( const EventObject& aEvent ) throw( TerminationVetoException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL notifyTermination( const EventObject& aEvent ) throw( RuntimeException, std::exception ) override;
-    virtual void SAL_CALL disposing( const EventObject& Source ) throw( RuntimeException, std::exception ) override;
+    virtual void SAL_CALL queryTermination( const EventObject& aEvent ) override;
+    virtual void SAL_CALL notifyTermination( const EventObject& aEvent ) override;
+    virtual void SAL_CALL disposing( const EventObject& Source ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw (RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
-void SAL_CALL SfxTerminateListener_Impl::disposing( const EventObject& ) throw( RuntimeException, std::exception )
+void SAL_CALL SfxTerminateListener_Impl::disposing( const EventObject& )
 {
 }
 
-void SAL_CALL SfxTerminateListener_Impl::queryTermination( const EventObject& ) throw(TerminationVetoException, RuntimeException, std::exception )
+void SAL_CALL SfxTerminateListener_Impl::queryTermination( const EventObject& )
 {
 }
 
-void SAL_CALL SfxTerminateListener_Impl::notifyTermination( const EventObject& aEvent ) throw(RuntimeException, std::exception )
+void SAL_CALL SfxTerminateListener_Impl::notifyTermination( const EventObject& aEvent )
 {
     Reference< XDesktop > xDesktop( aEvent.Source, UNO_QUERY );
     if( xDesktop.is() )
@@ -126,17 +126,17 @@ void SAL_CALL SfxTerminateListener_Impl::notifyTermination( const EventObject& a
     Application::Quit();
 }
 
-OUString SAL_CALL SfxTerminateListener_Impl::getImplementationName() throw (RuntimeException, std::exception)
+OUString SAL_CALL SfxTerminateListener_Impl::getImplementationName()
 {
     return OUString("com.sun.star.comp.sfx2.SfxTerminateListener");
 }
 
-sal_Bool SAL_CALL SfxTerminateListener_Impl::supportsService( const OUString& sServiceName ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SfxTerminateListener_Impl::supportsService( const OUString& sServiceName )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
-Sequence< OUString > SAL_CALL SfxTerminateListener_Impl::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL SfxTerminateListener_Impl::getSupportedServiceNames()
 {
     // Note: That service  does not really exists .-)
     // But this implementation is not thought to be registered really within our service.rdb.
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 9d6e641b28f7..d7bc5ff8d7b9 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -1655,14 +1655,12 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
 
 void SAL_CALL FilterOptionsContinuation::setFilterOptions(
                 const uno::Sequence<beans::PropertyValue>& rProps )
-        throw (uno::RuntimeException, std::exception)
 {
     rProperties = rProps;
 }
 
 uno::Sequence< beans::PropertyValue > SAL_CALL
     FilterOptionsContinuation::getFilterOptions()
-        throw (uno::RuntimeException, std::exception)
 {
     return rProperties;
 }
@@ -1685,14 +1683,12 @@ RequestFilterOptions::RequestFilterOptions( uno::Reference< frame::XModel > cons
 }
 
 uno::Any SAL_CALL RequestFilterOptions::getRequest()
-        throw( uno::RuntimeException, std::exception )
 {
     return m_aRequest;
 }
 
 uno::Sequence< uno::Reference< task::XInteractionContinuation > >
     SAL_CALL RequestFilterOptions::getContinuations()
-        throw( uno::RuntimeException, std::exception )
 {
     return { m_xAbort.get(), m_xOptions.get() };
 }
@@ -1707,9 +1703,8 @@ class RequestPackageReparation_Impl : public ::cppu::WeakImplHelper< task::XInte
 public:
     explicit RequestPackageReparation_Impl( const OUString& aName );
     bool    isApproved();
-    virtual uno::Any SAL_CALL getRequest() throw( uno::RuntimeException, std::exception ) override;
-    virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations()
-        throw( uno::RuntimeException, std::exception ) override;
+    virtual uno::Any SAL_CALL getRequest() override;
+    virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations() override;
 };
 
 RequestPackageReparation_Impl::RequestPackageReparation_Impl( const OUString& aName )
@@ -1728,14 +1723,12 @@ bool RequestPackageReparation_Impl::isApproved()
 }
 
 uno::Any SAL_CALL RequestPackageReparation_Impl::getRequest()
-        throw( uno::RuntimeException, std::exception )
 {
     return m_aRequest;
 }
 
 uno::Sequence< uno::Reference< task::XInteractionContinuation > >
     SAL_CALL RequestPackageReparation_Impl::getContinuations()
-        throw( uno::RuntimeException, std::exception )
 {
     return { m_xApprove.get(), m_xDisapprove.get() };
 }
@@ -1767,9 +1760,8 @@ class NotifyBrokenPackage_Impl : public ::cppu::WeakImplHelper< task::XInteracti
 
 public:
     explicit NotifyBrokenPackage_Impl(const OUString& rName);
-    virtual uno::Any SAL_CALL getRequest() throw( uno::RuntimeException, std::exception ) override;
-    virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations()
-        throw( uno::RuntimeException, std::exception ) override;
+    virtual uno::Any SAL_CALL getRequest() override;
+    virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations() override;
 };
 
 NotifyBrokenPackage_Impl::NotifyBrokenPackage_Impl( const OUString& aName )
@@ -1782,14 +1774,12 @@ NotifyBrokenPackage_Impl::NotifyBrokenPackage_Impl( const OUString& aName )
 }
 
 uno::Any SAL_CALL NotifyBrokenPackage_Impl::getRequest()
-        throw( uno::RuntimeException, std::exception )
 {
     return m_aRequest;
 }
 
 uno::Sequence< uno::Reference< task::XInteractionContinuation > >
     SAL_CALL NotifyBrokenPackage_Impl::getContinuations()
-        throw( uno::RuntimeException, std::exception )
 {
     return { m_xAbort.get() };
 }
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index f9735e23b2f1..84cfd12d1703 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -75,7 +75,7 @@ class DisposeListener : public ::cppu::WeakImplHelper< css::lang::XEventListener
             ,   m_pData ( pData  )
         {}
 
-        virtual void SAL_CALL disposing( const css::lang::EventObject& aSource ) throw (css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL disposing( const css::lang::EventObject& aSource ) override
         {
             css::uno::Reference< css::lang::XEventListener > xSelfHold( this );
 
diff --git a/sfx2/source/appl/helpdispatch.cxx b/sfx2/source/appl/helpdispatch.cxx
index 57e11602715e..9a631f90e6ab 100644
--- a/sfx2/source/appl/helpdispatch.cxx
+++ b/sfx2/source/appl/helpdispatch.cxx
@@ -50,7 +50,7 @@ HelpDispatch_Impl::~HelpDispatch_Impl()
 
 void SAL_CALL HelpDispatch_Impl::dispatch(
 
-    const URL& aURL, const Sequence< PropertyValue >& aArgs ) throw( RuntimeException, std::exception )
+    const URL& aURL, const Sequence< PropertyValue >& aArgs )
 
 {
     DBG_ASSERT( m_xRealDispatch.is(), "invalid dispatch" );
@@ -89,7 +89,7 @@ void SAL_CALL HelpDispatch_Impl::dispatch(
 
 void SAL_CALL HelpDispatch_Impl::addStatusListener(
 
-    const Reference< XStatusListener >& xControl, const URL& aURL ) throw( RuntimeException, std::exception )
+    const Reference< XStatusListener >& xControl, const URL& aURL )
 
 {
     DBG_ASSERT( m_xRealDispatch.is(), "invalid dispatch" );
@@ -99,7 +99,7 @@ void SAL_CALL HelpDispatch_Impl::addStatusListener(
 
 void SAL_CALL HelpDispatch_Impl::removeStatusListener(
 
-    const Reference< XStatusListener >& xControl, const URL& aURL ) throw( RuntimeException, std::exception )
+    const Reference< XStatusListener >& xControl, const URL& aURL )
 
 {
     DBG_ASSERT( m_xRealDispatch.is(), "invalid dispatch" );
diff --git a/sfx2/source/appl/helpdispatch.hxx b/sfx2/source/appl/helpdispatch.hxx
index dce297d4647c..b0494c6d0232 100644
--- a/sfx2/source/appl/helpdispatch.hxx
+++ b/sfx2/source/appl/helpdispatch.hxx
@@ -37,9 +37,9 @@ public:
     virtual ~HelpDispatch_Impl() override;
 
     // XDispatch
-    virtual void SAL_CALL   dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) override;
+    virtual void SAL_CALL   addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) override;
+    virtual void SAL_CALL   removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) override;
 };
 
 #endif // INCLUDED_SFX2_SOURCE_APPL_HELPDISPATCH_HXX
diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx
index c4d4c1a5bff4..4e97836a0e6b 100644
--- a/sfx2/source/appl/helpinterceptor.cxx
+++ b/sfx2/source/appl/helpinterceptor.cxx
@@ -127,8 +127,6 @@ Reference< XDispatch > SAL_CALL HelpInterceptor_Impl::queryDispatch(
 
     const URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags )
 
-    throw( RuntimeException, std::exception )
-
 {
     Reference< XDispatch > xResult;
     if ( m_xSlaveDispatcher.is() )
@@ -151,8 +149,6 @@ Sequence < Reference < XDispatch > > SAL_CALL HelpInterceptor_Impl::queryDispatc
 
     const Sequence< DispatchDescriptor >& aDescripts )
 
-    throw( RuntimeException, std::exception )
-
 {
     Sequence< Reference< XDispatch > > aReturn( aDescripts.getLength() );
     Reference< XDispatch >* pReturn = aReturn.getArray();
@@ -169,8 +165,6 @@ Sequence < Reference < XDispatch > > SAL_CALL HelpInterceptor_Impl::queryDispatc
 
 Reference< XDispatchProvider > SAL_CALL HelpInterceptor_Impl::getSlaveDispatchProvider()
 
-    throw( RuntimeException, std::exception )
-
 {
     return m_xSlaveDispatcher;
 }
@@ -178,8 +172,6 @@ Reference< XDispatchProvider > SAL_CALL HelpInterceptor_Impl::getSlaveDispatchPr
 
 void SAL_CALL HelpInterceptor_Impl::setSlaveDispatchProvider( const Reference< XDispatchProvider >& xNewSlave )
 
-    throw( RuntimeException, std::exception )
-
 {
     m_xSlaveDispatcher = xNewSlave;
 }
@@ -187,8 +179,6 @@ void SAL_CALL HelpInterceptor_Impl::setSlaveDispatchProvider( const Reference< X
 
 Reference< XDispatchProvider > SAL_CALL HelpInterceptor_Impl::getMasterDispatchProvider()
 
-    throw( RuntimeException, std::exception )
-
 {
     return m_xMasterDispatcher;
 }
@@ -196,8 +186,6 @@ Reference< XDispatchProvider > SAL_CALL HelpInterceptor_Impl::getMasterDispatchP
 
 void SAL_CALL HelpInterceptor_Impl::setMasterDispatchProvider( const Reference< XDispatchProvider >& xNewMaster )
 
-    throw( RuntimeException, std::exception )
-
 {
     m_xMasterDispatcher = xNewMaster;
 }
@@ -207,8 +195,6 @@ void SAL_CALL HelpInterceptor_Impl::setMasterDispatchProvider( const Reference<
 
 Sequence< OUString > SAL_CALL HelpInterceptor_Impl::getInterceptedURLs()
 
-    throw( RuntimeException, std::exception )
-
 {
     Sequence<OUString> aURLList { "vnd.sun.star.help://*" };
     return aURLList;
@@ -218,7 +204,7 @@ Sequence< OUString > SAL_CALL HelpInterceptor_Impl::getInterceptedURLs()
 // XDispatch
 
 void SAL_CALL HelpInterceptor_Impl::dispatch(
-    const URL& aURL, const Sequence< css::beans::PropertyValue >& ) throw( RuntimeException, std::exception )
+    const URL& aURL, const Sequence< css::beans::PropertyValue >& )
 {
     bool bBack = aURL.Complete == ".uno:Backward";
     if ( bBack || aURL.Complete == ".uno:Forward" )
@@ -256,7 +242,7 @@ void SAL_CALL HelpInterceptor_Impl::dispatch(
 
 
 void SAL_CALL HelpInterceptor_Impl::addStatusListener(
-    const Reference< XStatusListener >& xControl, const URL& ) throw( RuntimeException, std::exception )
+    const Reference< XStatusListener >& xControl, const URL& )
 {
     DBG_ASSERT( !m_xListener.is(), "listener already exists" );
     m_xListener = xControl;
@@ -264,7 +250,7 @@ void SAL_CALL HelpInterceptor_Impl::addStatusListener(
 
 
 void SAL_CALL HelpInterceptor_Impl::removeStatusListener(
-    const Reference< XStatusListener >&, const URL&) throw( RuntimeException, std::exception )
+    const Reference< XStatusListener >&, const URL&)
 {
     m_xListener = nullptr;
 }
@@ -279,7 +265,6 @@ HelpListener_Impl::HelpListener_Impl( HelpInterceptor_Impl* pInter )
 
 
 void SAL_CALL HelpListener_Impl::statusChanged( const css::frame::FeatureStateEvent& Event )
-    throw( css::uno::RuntimeException, std::exception )
 {
     INetURLObject aObj( Event.FeatureURL.Complete );
     aFactory = aObj.GetHost();
@@ -288,7 +273,6 @@ void SAL_CALL HelpListener_Impl::statusChanged( const css::frame::FeatureStateEv
 
 
 void SAL_CALL HelpListener_Impl::disposing( const css::lang::EventObject& )
-    throw( css::uno::RuntimeException, std::exception )
 {
     pInterceptor->removeStatusListener( this, css::util::URL() );
     pInterceptor = nullptr;
@@ -307,12 +291,12 @@ HelpStatusListener_Impl::~HelpStatusListener_Impl()
 }
 
 void HelpStatusListener_Impl::statusChanged(
-    const FeatureStateEvent& rEvent ) throw( RuntimeException, std::exception )
+    const FeatureStateEvent& rEvent )
 {
     aStateEvent = rEvent;
 }
 
-void HelpStatusListener_Impl::disposing( const EventObject& ) throw( RuntimeException, std::exception )
+void HelpStatusListener_Impl::disposing( const EventObject& )
 {
     xDispatch->removeStatusListener(this, css::util::URL());
     xDispatch = nullptr;
diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx
index 96836a09415f..f557d35c82f7 100644
--- a/sfx2/source/appl/helpinterceptor.hxx
+++ b/sfx2/source/appl/helpinterceptor.hxx
@@ -84,26 +84,26 @@ public:
 
     // XDispatchProvider
     virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL
-                            queryDispatch( const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(css::uno::RuntimeException, std::exception) override;
+                            queryDispatch( const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) override;
     virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL
-                            queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts ) throw(css::uno::RuntimeException, std::exception) override;
+                            queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts ) override;
 
     // XDispatchProviderInterceptor
     virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL
-                            getSlaveDispatchProvider(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setSlaveDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewSlave ) throw(css::uno::RuntimeException, std::exception) override;
+                            getSlaveDispatchProvider(  ) override;
+    virtual void SAL_CALL   setSlaveDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewSlave ) override;
     virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL
-                            getMasterDispatchProvider(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setMasterDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewMaster ) throw(css::uno::RuntimeException, std::exception) override;
+                            getMasterDispatchProvider(  ) override;
+    virtual void SAL_CALL   setMasterDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewMaster ) override;
 
     // XInterceptorInfo
     virtual css::uno::Sequence< OUString > SAL_CALL
-                            getInterceptedURLs(  ) throw(css::uno::RuntimeException, std::exception) override;
+                            getInterceptedURLs(  ) override;
 
     // XDispatch
-    virtual void SAL_CALL   dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) override;
+    virtual void SAL_CALL   addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) override;
+    virtual void SAL_CALL   removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) override;
 
     // extras
     void                    InitWaiter( SfxHelpWindow_Impl* pWindow )
@@ -123,10 +123,8 @@ private:
 public:
     explicit HelpListener_Impl( HelpInterceptor_Impl* pInter );
 
-    virtual void SAL_CALL   statusChanged( const css::frame::FeatureStateEvent& Event )
-                                throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL   disposing( const css::lang::EventObject& obj )
-                                throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL   statusChanged( const css::frame::FeatureStateEvent& Event ) override;
+    virtual void SAL_CALL   disposing( const css::lang::EventObject& obj ) override;
 
     void                    SetChangeHdl( const Link<HelpListener_Impl&,void>& rLink ) { aChangeLink = rLink; }
     const OUString&         GetFactory() const { return aFactory; }
@@ -145,10 +143,8 @@ public:
         css::util::URL& rURL);
     virtual ~HelpStatusListener_Impl() override;
 
-    virtual void SAL_CALL   statusChanged( const css::frame::FeatureStateEvent& Event )
-                                throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL   disposing( const css::lang::EventObject& obj )
-                                throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL   statusChanged( const css::frame::FeatureStateEvent& Event ) override;
+    virtual void SAL_CALL   disposing( const css::lang::EventObject& obj ) override;
     const css::frame::FeatureStateEvent&
                             GetStateEvent() const {return aStateEvent;}
 };
diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx
index db58ef5c40e9..58c0f15184d2 100644
--- a/sfx2/source/appl/imestatuswindow.cxx
+++ b/sfx2/source/appl/imestatuswindow.cxx
@@ -55,8 +55,7 @@ class WeakPropertyChangeListener : public ::cppu::WeakImplHelper<css::beans::XPr
         {
         }
 
-        virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent &rEvent )
-            throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent &rEvent ) override
         {
             css::uno::Reference<css::beans::XPropertyChangeListener> xOwner(mxOwner.get(),
                 css::uno::UNO_QUERY);
@@ -66,8 +65,7 @@ class WeakPropertyChangeListener : public ::cppu::WeakImplHelper<css::beans::XPr
         }
 
         // lang.XEventListener
-        virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent)
-            throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent) override
         {
             css::uno::Reference<css::beans::XPropertyChangeListener> xOwner(mxOwner.get(),
                 css::uno::UNO_QUERY);
@@ -164,7 +162,6 @@ ImeStatusWindow::~ImeStatusWindow()
 }
 
 void SAL_CALL ImeStatusWindow::disposing(css::lang::EventObject const & )
-    throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard(m_aMutex);
     m_xConfig = nullptr;
@@ -173,7 +170,6 @@ void SAL_CALL ImeStatusWindow::disposing(css::lang::EventObject const & )
 
 void SAL_CALL
 ImeStatusWindow::propertyChange(css::beans::PropertyChangeEvent const & )
-    throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SfxApplication* pApp = SfxApplication::Get();
diff --git a/sfx2/source/appl/imestatuswindow.hxx b/sfx2/source/appl/imestatuswindow.hxx
index 8af134a21016..f9df1c623950 100644
--- a/sfx2/source/appl/imestatuswindow.hxx
+++ b/sfx2/source/appl/imestatuswindow.hxx
@@ -93,12 +93,10 @@ private:
     virtual ~ImeStatusWindow() override;
 
     virtual void SAL_CALL
-    disposing(css::lang::EventObject const & rSource)
-        throw (css::uno::RuntimeException, std::exception) override;
+    disposing(css::lang::EventObject const & rSource) override;
 
     virtual void SAL_CALL
-    propertyChange(css::beans::PropertyChangeEvent const & rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    propertyChange(css::beans::PropertyChangeEvent const & rEvent) override;
 
     css::uno::Reference< css::beans::XPropertySet >
     getConfig();
diff --git a/sfx2/source/appl/macroloader.cxx b/sfx2/source/appl/macroloader.cxx
index 92ecab7313c7..19737c90b22a 100644
--- a/sfx2/source/appl/macroloader.cxx
+++ b/sfx2/source/appl/macroloader.cxx
@@ -48,7 +48,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
 
 SfxMacroLoader::SfxMacroLoader(const css::uno::Sequence< css::uno::Any >& aArguments)
-    throw (css::uno::Exception, css::uno::RuntimeException)
 {
     Reference < XFrame > xFrame;
     if ( aArguments.getLength() )
@@ -59,19 +58,16 @@ SfxMacroLoader::SfxMacroLoader(const css::uno::Sequence< css::uno::Any >& aArgum
 }
 
 OUString SAL_CALL SfxMacroLoader::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.sfx2.SfxMacroLoader");
 }
 
 sal_Bool SAL_CALL SfxMacroLoader::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString> SAL_CALL SfxMacroLoader::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence< OUString > aSeq { "com.sun.star.frame.ProtocolHandler" };
     return aSeq;
@@ -101,7 +97,7 @@ SfxObjectShell* SfxMacroLoader::GetObjectShell_Impl()
 uno::Reference<frame::XDispatch> SAL_CALL SfxMacroLoader::queryDispatch(
     const util::URL&   aURL            ,
     const OUString&               /*sTargetFrameName*/,
-    sal_Int32                            /*nSearchFlags*/    ) throw( uno::RuntimeException, std::exception )
+    sal_Int32                            /*nSearchFlags*/    )
 {
     uno::Reference<frame::XDispatch> xDispatcher;
     if(aURL.Complete.startsWith("macro:"))
@@ -112,7 +108,6 @@ uno::Reference<frame::XDispatch> SAL_CALL SfxMacroLoader::queryDispatch(
 
 uno::Sequence< uno::Reference<frame::XDispatch> > SAL_CALL
                 SfxMacroLoader::queryDispatches( const uno::Sequence < frame::DispatchDescriptor >& seqDescriptor )
-                    throw( uno::RuntimeException, std::exception )
 {
     sal_Int32 nCount = seqDescriptor.getLength();
     uno::Sequence< uno::Reference<frame::XDispatch> > lDispatcher(nCount);
@@ -127,7 +122,6 @@ uno::Sequence< uno::Reference<frame::XDispatch> > SAL_CALL
 void SAL_CALL SfxMacroLoader::dispatchWithNotification(
     const util::URL& aURL, const uno::Sequence<beans::PropertyValue>& /*lArgs*/,
     const uno::Reference<frame::XDispatchResultListener>& xListener )
-              throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -151,7 +145,6 @@ void SAL_CALL SfxMacroLoader::dispatchWithNotification(
 
 uno::Any SAL_CALL SfxMacroLoader::dispatchWithReturnValue(
     const util::URL& aURL, const uno::Sequence<beans::PropertyValue>& )
-        throw (uno::RuntimeException, std::exception)
 {
     uno::Any aRet;
     loadMacro( aURL.Complete, aRet, GetObjectShell_Impl() );
@@ -160,7 +153,6 @@ uno::Any SAL_CALL SfxMacroLoader::dispatchWithReturnValue(
 
 void SAL_CALL SfxMacroLoader::dispatch(
     const util::URL& aURL, const uno::Sequence<beans::PropertyValue>& /*lArgs*/ )
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -171,7 +163,6 @@ void SAL_CALL SfxMacroLoader::dispatch(
 void SAL_CALL SfxMacroLoader::addStatusListener(
     const uno::Reference< frame::XStatusListener >& ,
     const util::URL&                                                    )
-              throw (uno::RuntimeException, std::exception)
 {
     /* TODO
             How we can handle different listener for further coming or currently running dispatch() jobs
@@ -183,12 +174,10 @@ void SAL_CALL SfxMacroLoader::addStatusListener(
 void SAL_CALL SfxMacroLoader::removeStatusListener(
     const uno::Reference< frame::XStatusListener >&,
     const util::URL&                                                  )
-        throw (uno::RuntimeException, std::exception)
 {
 }
 
 ErrCode SfxMacroLoader::loadMacro( const OUString& rURL, css::uno::Any& rRetval, SfxObjectShell* pSh )
-    throw ( ucb::ContentCreationException, uno::RuntimeException, std::exception )
 {
 #if !HAVE_FEATURE_SCRIPTING
     (void) rURL;
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index 38754445e180..be1eef7aaf13 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -68,8 +68,7 @@ class StringLength : public ::cppu::WeakImplHelper< XStringWidth >
         StringLength() {}
 
         // XStringWidth
-        sal_Int32 SAL_CALL queryStringWidth( const OUString& aString )
-            throw (css::uno::RuntimeException, std::exception) override
+        sal_Int32 SAL_CALL queryStringWidth( const OUString& aString ) override
         {
             return aString.getLength();
         }
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index b1127a4880a7..80552baf2e01 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -88,33 +88,30 @@ extern "C" { static void SAL_CALL thisModule() {} }
 class SfxNotificationListener_Impl : public cppu::WeakImplHelper< XDispatchResultListener >
 {
 public:
-    virtual void SAL_CALL dispatchFinished( const DispatchResultEvent& aEvent ) throw( RuntimeException, std::exception ) override;
-    virtual void SAL_CALL disposing( const EventObject& aEvent ) throw( RuntimeException, std::exception ) override;
+    virtual void SAL_CALL dispatchFinished( const DispatchResultEvent& aEvent ) override;
+    virtual void SAL_CALL disposing( const EventObject& aEvent ) override;
 };
 
-void SAL_CALL SfxNotificationListener_Impl::dispatchFinished( const DispatchResultEvent& ) throw( RuntimeException, std::exception )
+void SAL_CALL SfxNotificationListener_Impl::dispatchFinished( const DispatchResultEvent& )
 {
     ShutdownIcon::LeaveModalMode();
 }
 
-void SAL_CALL SfxNotificationListener_Impl::disposing( const EventObject& ) throw( RuntimeException, std::exception )
+void SAL_CALL SfxNotificationListener_Impl::disposing( const EventObject& )
 {
 }
 
 OUString SAL_CALL ShutdownIcon::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.desktop.QuickstartWrapper");
 }
 
 sal_Bool SAL_CALL ShutdownIcon::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString> SAL_CALL ShutdownIcon::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence< OUString > aSeq { "com.sun.star.office.Quickstart" };
     return aSeq;
@@ -559,7 +556,7 @@ ShutdownIcon* ShutdownIcon::createInstance()
     return pShutdownIcon;
 }
 
-void ShutdownIcon::init() throw( css::uno::Exception, std::exception )
+void ShutdownIcon::init()
 {
     // access resource system and sfx only protected by solarmutex
     ::SolarMutexGuard aSolarGuard;
@@ -585,14 +582,12 @@ void SAL_CALL ShutdownIcon::disposing()
 
 // XEventListener
 void SAL_CALL ShutdownIcon::disposing( const css::lang::EventObject& )
-    throw(css::uno::RuntimeException, std::exception)
 {
 }
 
 
 // XTerminateListener
 void SAL_CALL ShutdownIcon::queryTermination( const css::lang::EventObject& )
-throw(css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception)
 {
     SAL_INFO("sfx.appl", "ShutdownIcon::queryTermination: veto is " << m_bVeto);
     ::osl::ClearableMutexGuard  aGuard( m_aMutex );
@@ -603,13 +598,11 @@ throw(css::frame::TerminationVetoException, css::uno::RuntimeException, std::exc
 
 
 void SAL_CALL ShutdownIcon::notifyTermination( const css::lang::EventObject& )
-throw(css::uno::RuntimeException, std::exception)
 {
 }
 
 
 void SAL_CALL ShutdownIcon::initialize( const css::uno::Sequence< css::uno::Any>& aArguments )
-    throw( css::uno::Exception, std::exception )
 {
     ::osl::ResettableMutexGuard aGuard( m_aMutex );
 
@@ -825,11 +818,6 @@ static const ::sal_Int32 PROPHANDLE_TERMINATEVETOSTATE = 0;
 // XFastPropertySet
 void SAL_CALL ShutdownIcon::setFastPropertyValue(       ::sal_Int32                  nHandle,
                                                   const css::uno::Any& aValue )
-    throw (css::beans::UnknownPropertyException,
-            css::beans::PropertyVetoException,
-            css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception)
 {
     switch(nHandle)
     {
@@ -853,9 +841,6 @@ void SAL_CALL ShutdownIcon::setFastPropertyValue(       ::sal_Int32
 
 // XFastPropertySet
 css::uno::Any SAL_CALL ShutdownIcon::getFastPropertyValue( ::sal_Int32 nHandle )
-    throw (css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception)
 {
     css::uno::Any aValue;
     switch(nHandle)
diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx
index 963c343529c5..1d49954c5a6e 100644
--- a/sfx2/source/appl/shutdownicon.hxx
+++ b/sfx2/source/appl/shutdownicon.hxx
@@ -89,14 +89,11 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase
 
         virtual ~ShutdownIcon() override;
 
-        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;
+        virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
 
-        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
         static ShutdownIcon* getInstance();
         static ShutdownIcon* createInstance();
@@ -114,7 +111,7 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase
         static bool bModalMode;
 
         /// @throws css::uno::Exception
-        void init() throw( css::uno::Exception, std::exception );
+        void init();
 
         OUString GetResString( int id );
         static OUString GetUrlDescription( const OUString& aUrl );
@@ -130,31 +127,19 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase
         virtual void SAL_CALL disposing() override;
 
         // XEventListener
-        virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 
         // XTerminateListener
-        virtual void SAL_CALL queryTermination( const css::lang::EventObject& aEvent )
-            throw(css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL notifyTermination( const css::lang::EventObject& aEvent )
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL queryTermination( const css::lang::EventObject& aEvent ) override;
+        virtual void SAL_CALL notifyTermination( const css::lang::EventObject& aEvent ) override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-            throw( css::uno::Exception, std::exception ) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         // XFastPropertySet
         virtual void SAL_CALL setFastPropertyValue(       ::sal_Int32                  nHandle,
-                                                    const css::uno::Any& aValue )
-            throw (css::beans::UnknownPropertyException,
-                    css::beans::PropertyVetoException,
-                    css::lang::IllegalArgumentException,
-                    css::lang::WrappedTargetException,
-                    css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle )
-            throw (css::beans::UnknownPropertyException,
-                    css::lang::WrappedTargetException,
-                    css::uno::RuntimeException, std::exception) override;
+                                                    const css::uno::Any& aValue ) override;
+        virtual css::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) override;
 
         css::uno::Reference< css::frame::XDesktop2 > m_xDesktop;
 
diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm
index 3c04333531f4..8a36273e2ec1 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
@@ -135,8 +135,7 @@ class RecentFilesStringLength : public ::cppu::WeakImplHelper< css::util::XStrin
         RecentFilesStringLength() {}
 
         // XStringWidth
-        sal_Int32 SAL_CALL queryStringWidth( const ::rtl::OUString& aString )
-            throw ( css::uno::RuntimeException ) override
+        sal_Int32 SAL_CALL queryStringWidth( const ::rtl::OUString& aString ) override
         {
             return aString.getLength();
         }
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 1c15d90bffe9..10e3366b3dc3 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -197,20 +197,17 @@ void LayoutManagerListener::setFrame( const css::uno::Reference< css::frame::XFr
 
 void SAL_CALL LayoutManagerListener::addEventListener(
     const css::uno::Reference< css::lang::XEventListener >& )
-throw (css::uno::RuntimeException, std::exception)
 {
     // do nothing, only internal class
 }
 
 void SAL_CALL LayoutManagerListener::removeEventListener(
     const css::uno::Reference< css::lang::XEventListener >& )
-throw (css::uno::RuntimeException, std::exception)
 {
     // do nothing, only internal class
 }
 
 void SAL_CALL LayoutManagerListener::dispose()
-throw( css::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -257,7 +254,6 @@ throw( css::uno::RuntimeException, std::exception )
 
 void SAL_CALL LayoutManagerListener::disposing(
     const css::lang::EventObject& )
-throw( css::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     m_pWrkWin = nullptr;
@@ -272,7 +268,6 @@ void SAL_CALL LayoutManagerListener::layoutEvent(
     const css::lang::EventObject&,
     ::sal_Int16                   eLayoutEvent,
     const css::uno::Any&                        )
-throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( m_pWrkWin )
diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx
index 8e1a2eec043d..3980c3204618 100644
--- a/sfx2/source/appl/xpackcreator.cxx
+++ b/sfx2/source/appl/xpackcreator.cxx
@@ -45,19 +45,17 @@ public:
     OPackageStructureCreator() {}
 
     // XPackageStructureCreator
-    virtual void SAL_CALL convertToPackage( const OUString& aFolderUrl, const uno::Reference< io::XOutputStream >& xTargetStream ) throw (io::IOException, uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL convertToPackage( const OUString& aFolderUrl, const uno::Reference< io::XOutputStream >& xTargetStream ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception) override;
-    virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 
 void SAL_CALL OPackageStructureCreator::convertToPackage( const OUString& aFolderUrl,
                                                           const uno::Reference< io::XOutputStream >& xTargetStream )
-        throw ( io::IOException,
-                uno::RuntimeException, std::exception )
 {
     uno::Reference< ucb::XCommandEnvironment > xComEnv;
 
@@ -148,19 +146,16 @@ void SAL_CALL OPackageStructureCreator::convertToPackage( const OUString& aFolde
 }
 
 OUString SAL_CALL OPackageStructureCreator::getImplementationName()
-    throw ( uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.embed.PackageStructureCreator");
 }
 
 sal_Bool SAL_CALL OPackageStructureCreator::supportsService( const OUString& ServiceName )
-    throw ( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL OPackageStructureCreator::getSupportedServiceNames()
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Sequence< OUString > aRet(2);
     aRet[0] = "com.sun.star.embed.PackageStructureCreator";